Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 22464) +++ applications/editors/josm/i18n/po/ar.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-10 14:15+0000\n" -"Last-Translator: metehyi \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 20:41+0000\n" +"Last-Translator: bastik \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\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: 2010-07-11 18:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -24,11 +24,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "المساعدة" @@ -41,5 +41,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -72,7 +72,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -229,8 +229,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -240,13 +240,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -262,5 +263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -269,5 +270,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -284,13 +286,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "إلغاء" @@ -349,11 +351,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -400,6 +402,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -427,5 +430,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -549,5 +552,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -607,6 +610,6 @@ msgstr "الرجاء إختر على الأقل طريقتين للدمج." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -615,9 +618,9 @@ msgstr "نسخ" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "نسخ الكائنات المختارة الى وسيط الصق" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "الرجاء إختيار شيء للنسخ." @@ -650,6 +653,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -718,5 +721,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "" @@ -736,5 +739,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "" @@ -745,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "" @@ -788,5 +791,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "نسخة مطابقة" @@ -934,25 +937,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "تمت إضافة العقدة على كل التقطعات" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "صلّح العلاقات" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -960,33 +963,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "ادخل القيم لكل التناقضات." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "حلل التناقضات" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "صلّح تضاربات التسمية" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "تم حذف العنصر من العلاقات" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "" @@ -1005,5 +1008,5 @@ msgstr "ضمّ العقدة و الخط" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "لا إختصار" @@ -1348,6 +1351,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1358,17 +1361,17 @@ msgstr "ألصِق" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1377,14 +1380,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Paste Tags" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1393,5 +1396,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1460,5 +1463,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1469,12 +1472,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1501,6 +1504,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "خطأ" @@ -1528,5 +1531,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "إحفَظ" @@ -1933,4 +1936,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "" @@ -2394,4 +2398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2694,5 +2699,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "" @@ -2887,5 +2892,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2906,9 +2911,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "مُوافق" @@ -3009,5 +3014,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3100,5 +3105,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3109,5 +3114,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3291,10 +3296,41 @@ msgstr "خصائص " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "خطء حين إنشاء مجلد الخابية: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" msgstr "" @@ -3497,5 +3533,5 @@ msgstr "ش." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3503,5 +3539,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3541,5 +3577,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3580,6 +3616,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3595,5 +3630,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3609,7 +3643,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3831,7 +3864,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3839,29 +3872,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "غير كامل" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "من النوع طريق" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "خط سكة حديد" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "مجرى مياه" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "إستعمال الأرض" @@ -3869,7 +3902,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3885,5 +3918,5 @@ msgstr[5] "{0} عقد" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3942,6 +3975,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3949,6 +3982,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3957,5 +3990,5 @@ msgstr[1] "{0} أعضاء" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4030,5 +4063,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4123,69 +4156,69 @@ msgstr "كلمة‌المرور" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "الإستعمال" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "الخيارات" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "أعرض هذه المساعدة" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +msgid "Standard unix geometry argument" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" +msgid "Download the bounding box" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 -msgid "Download the bounding box" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 -msgid "Select with the given search" +msgid "Launch in maximized mode" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" +msgid "Reset the preferences to default" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 -msgid "Reset the preferences to default" +msgid "Set the language" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4195,9 +4228,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "أمثال" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4205,46 +4238,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "جاري التهيئة" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "حلّ" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "الملفّ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4263,10 +4312,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "العرض" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4274,10 +4323,11 @@ msgstr "العدة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "التعيينات المسبقة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4288,5 +4338,5 @@ msgstr "اللائحة: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "سمعيّ" @@ -4553,5 +4603,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4569,5 +4619,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4772,5 +4822,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "" @@ -4987,6 +5037,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5001,6 +5051,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5061,17 +5111,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5142,20 +5192,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5164,5 +5216,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5178,5 +5230,5 @@ msgstr[5] "{0} طريق" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5242,5 +5294,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5344,5 +5396,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5744,5 +5796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5825,5 +5877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6025,5 +6077,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6876,5 +6928,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7444,5 +7496,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<مختلف>" @@ -7573,5 +7625,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7628,26 +7680,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7656,14 +7708,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7673,9 +7725,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7685,15 +7737,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7701,5 +7753,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7707,20 +7759,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7729,64 +7781,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7795,23 +7847,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7820,5 +7872,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7827,50 +7879,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7879,26 +7931,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8231,5 +8289,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9658,12 +9716,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "نزّل من أو.أس.أم على طول هذا المسلك" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "نزّل كلّ شيئ بين:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9671,8 +9733,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "المساحة القصوى للمطلب:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9696,4 +9760,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10133,10 +10198,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10145,5 +10210,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12314,5 +12379,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12321,53 +12386,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "مزيد من المعلومات عن هذه الميزة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "ميزات خيارية:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "طريق مغلقة الدوران" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "نوع غير معروف: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12377,15 +12438,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "خطأ في التحليل النحوي {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "العناصر من الفصيلة {0} هي مدعومة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12399,18 +12460,18 @@ msgstr[5] "غيّر {0} غرض" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "الخيار فارغ !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "الخيار غير مناسب !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "طبّق الخيار المسبق" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "غيّر الخصائص" @@ -12425,4 +12486,27 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "إبحث" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "بحث عن أغراض." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +msgid "Show only applicable to selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "بحث عن أغراض." #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13124,5 +13208,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13134,10 +13218,10 @@ msgstr "ملفات الخادم أو.أس.أم" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13146,5 +13230,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13863,11 +13947,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13876,16 +13960,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13894,5 +13978,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14153,5 +14237,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14868,14 +14952,14 @@ msgstr "مباني" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14907,5 +14991,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -14962,5 +15046,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -14968,5 +15052,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -14975,5 +15059,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -14981,17 +15065,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15000,13 +15084,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15031,13 +15115,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15093,5 +15181,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15102,13 +15190,13 @@ msgstr "الماء" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15156,5 +15244,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15162,26 +15250,26 @@ msgstr "العنوان" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "تمكين الإخباء التلقائي" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "حجم الخابية الأقصى (م. بايت)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15193,18 +15281,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15212,5 +15300,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15218,127 +15306,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15346,5 +15439,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15735,4 +15828,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "موقع التنزيل" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "نزّل من أو.أس.أم على طول هذا المسلك" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "نزّل المساحة" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "نوع الطلاء {0}:{1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15822,5 +15950,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15903,5 +16031,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "" @@ -16444,30 +16572,31 @@ msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16579,13 +16708,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17087,9 +17216,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17132,5 +17256,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17158,10 +17282,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18341,47 +18465,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18615,14 +18739,45 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +msgid "Mixed type duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +msgid "Highway duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "أرض سكة حديد" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +msgid "Waterway duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +msgid "Boundary duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +msgid "Power duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18775,59 +18930,59 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19684,55 +19839,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19873,398 +20028,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "الحدود" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "الفلق الأمامي" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "خط أنابيب" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "متعدد الضلوع" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "الشبكة" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "خرائط_النقل_العام" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "حصر" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "طريق" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "ألصِق" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "مجرى مياه" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "حدّث" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20321,11 +20371,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "نزّل من أو.أس.أم على طول هذا المسلك" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20334,20 +20390,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20357,10 +20413,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20368,5 +20424,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20376,15 +20432,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20393,5 +20449,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20401,15 +20457,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20417,5 +20473,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20423,5 +20479,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20430,5 +20486,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20437,10 +20493,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20448,15 +20504,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20466,5 +20522,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20473,10 +20529,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20485,5 +20541,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20492,15 +20548,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20510,10 +20566,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20522,5 +20578,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20529,5 +20585,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20536,10 +20592,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20548,5 +20604,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20556,5 +20612,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20563,15 +20619,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20580,5 +20636,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27173,8 +27229,11 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "خط أنابيب" #: build/trans_presets.java:2452 +msgctxt "Power Line" msgid "minor_line" msgstr "" @@ -32538,4 +32597,177 @@ msgstr "شاطئ" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "طريق" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "الحدود" + #. color deprecated #. @@ -33054,4 +33286,7 @@ msgstr "" +#~ msgid "closedway" +#~ msgstr "طريق مغلقة الدوران" + #~ msgid "Unknown version" #~ msgstr "نسخة مجهولة" @@ -33125,7 +33360,4 @@ #~ msgid "to" #~ msgstr "إلى" - -#~ msgid "Download Area" -#~ msgstr "نزّل المساحة" #~ msgid "Please enter a search string" @@ -33348,7 +33580,4 @@ #~ msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم." -#~ msgid "Please select at least one task to download" -#~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها" - #~ msgid "Error while loading page {0}" #~ msgstr "خطء عند تحميل الصفحة {0}" Index: applications/editors/josm/i18n/po/bg.po =================================================================== --- applications/editors/josm/i18n/po/bg.po (revision 22464) +++ applications/editors/josm/i18n/po/bg.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-07 10:27+0000\n" -"Last-Translator: pl71 \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 21:00+0000\n" +"Last-Translator: bastik \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: 2010-07-11 18:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Помощ" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ "Параметърът \"downloadgps\" не възприема имена на файлове или файлови URL." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -234,8 +234,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -245,13 +245,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -267,5 +268,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -274,5 +275,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -289,13 +291,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Отмяна" @@ -356,11 +358,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -407,6 +409,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -434,5 +437,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -556,5 +559,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -618,6 +621,6 @@ msgstr "Моля, изберете поне две линии за комбиниране." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -626,9 +629,9 @@ msgstr "Копиране" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Копиране на избраните обекти в буфера за обмен." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Моля, изберете нещо за копиране." @@ -661,6 +664,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -730,5 +733,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "На отделен слой" @@ -748,5 +751,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Тип на обекта:" @@ -757,5 +760,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID на обекта:" @@ -800,5 +803,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Дублиране" @@ -947,25 +950,25 @@ msgstr "Няма намерено пресичане. Няма направени промени." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Добавен възел на всички кръстовища" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Изтриване Пътища, които не са част от вътрешен мултиполигон" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Поправяне на релации" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Свързана само-пресичаща се област" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Свързана пресичаща област" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -975,33 +978,33 @@ "проверете дали няма да се появят грешки." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Въведете стойности за всички конфликти." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Поправяне конфликти маркери" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Премахнати елементи от връзки" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Присъедини области: премахване на кратки пътища" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Затворен Път" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Премахване на маркери от вътрешни пътища" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Функция свързване на области" @@ -1020,5 +1023,5 @@ msgstr "Свързване на точка с линия" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Няма бърза клавишна комбинация" @@ -1367,6 +1370,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1377,17 +1380,17 @@ msgstr "Поставяне" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Поставяне на съдържанието на буфера" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1396,14 +1399,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Поставяне на маркери" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Приложи маркерите от буфера за копиране към всички избрани обекти." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1412,5 +1415,5 @@ msgstr[1] "Поставяне на {0} етикета" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1479,5 +1482,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1488,12 +1491,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1520,6 +1523,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Грешка" @@ -1547,5 +1550,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Запазване" @@ -1973,4 +1976,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "" @@ -2442,4 +2446,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2753,5 +2758,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Филтър" @@ -2954,5 +2959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2973,9 +2978,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "ОК" @@ -3078,5 +3083,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Двоен конфликт" @@ -3172,5 +3177,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3184,5 +3189,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Потвърждение за изтриване" @@ -3370,11 +3375,42 @@ msgstr "Свойства на " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Роли в релации, отнасящи се за" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Автоматично поправяне на маркерите" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Грешка при четене на файлове от директория {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Невъзможно да се вземе каноничното име на директория {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Грешка при създаване на кеш директория: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3586,5 +3622,5 @@ msgstr "И" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3592,5 +3628,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3630,5 +3666,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3669,6 +3705,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3680,5 +3715,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3690,7 +3724,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3910,7 +3943,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3918,29 +3951,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "непълен" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "път / магистрала" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "железопътна линия" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "водоеми" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "земеползване" @@ -3948,7 +3981,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3960,5 +3993,5 @@ msgstr[1] "{0} точки" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -4017,6 +4050,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4024,6 +4057,6 @@ msgstr "сграда" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4032,5 +4065,5 @@ msgstr[1] "{0} члена" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4105,5 +4138,5 @@ msgstr "Обектът е изтрит" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4204,69 +4237,69 @@ msgstr "Парола" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "използване" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Показване на тази помощ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Стандартен параметри на unix геометрия" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Сваляне на област в предала на рамка" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Сваляне на област от рамка, като GPS данни" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "Избор с даденото търсене" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Стартиране в максимизиран режим" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Възстановяване на параметрите по подразбиране" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/път/към/папката/на/JOSM/ " +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4276,9 +4309,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "примери" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4286,46 +4319,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Инициализиране" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Зареждане на ранните разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Настройки по подразбиране" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Създаване на интерфейса" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Зареждане на разширения" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Разрешаване" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Настройката {0} беше премахната тъй като вече не се използва." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4344,10 +4393,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Преглед" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4355,10 +4404,11 @@ msgstr "Инструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Шаблони" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4369,5 +4419,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Аудио" @@ -4635,5 +4685,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4651,5 +4701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4856,5 +4906,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Нагоре" @@ -5072,6 +5122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5086,6 +5136,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5146,17 +5196,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5227,20 +5277,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Поставяне..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "От..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "На..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5249,5 +5301,5 @@ msgstr[1] "{0} етикета" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5259,5 +5311,5 @@ msgstr[1] "{0} пътя" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5323,5 +5375,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Стойност:" @@ -5425,5 +5477,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5825,5 +5877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5906,5 +5958,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6108,5 +6160,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6959,5 +7011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7527,5 +7579,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<различни>" @@ -7656,5 +7708,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7713,26 +7765,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Етикети и членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Родителски релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Подчинени релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7741,14 +7793,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7758,9 +7810,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7770,15 +7822,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7786,5 +7838,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7792,20 +7844,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Редактор на отношения: Премахване на избраното" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7814,64 +7866,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Сортиране на членовете на връзката" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Редактор на връзки: Сортиране" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Преместване на текущо избраните членове нагоре" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Редактор на връзки: Преместване нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Редактор на връзки: Преместване надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Премахване на текущо избраните членове от тази връзка" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Редактор на връзки: Премахване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Изтриване на текущо редактираната врзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7880,23 +7932,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Да, създай конфликт и затвори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Не, продължава редактирането" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7905,5 +7957,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7912,50 +7964,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Прилагане на обновяването и затваряне на прозореца." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Добави празен етикет" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Редактор на връзки: Сваляне на членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Установява роля за избраните членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Приложи роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7964,26 +8016,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Да, приложи го!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Не, не прилагай!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Потвърди празна роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8320,5 +8378,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9774,12 +9832,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Свали от OSM по дължина на тази следа" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Свали всичко в пределите на:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9787,8 +9849,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Максимална област за една заявка:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9812,4 +9876,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10256,10 +10321,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10268,5 +10333,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12480,5 +12545,5 @@ msgstr "Добавяне на нов етикет" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12487,53 +12552,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Повече информация за тази възможност" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Незадължителни Атрибути:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "затворен път" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестен тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12543,15 +12604,15 @@ msgstr "Не може да се прочете източник на шаблони за маркиране: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Грешка при разбор {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Елементи от тип {0} се поддържат." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12561,18 +12622,18 @@ msgstr[1] "Промяна {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Нищо не е избрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Селекцията е неподходяща!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Прилагане шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Промяна параметри" @@ -12587,4 +12648,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Търси: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Търсене на обекти." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Мащабиране по селекцията" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Търси: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13288,5 +13373,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13298,10 +13383,10 @@ msgstr "OSM сървърни файлове" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13310,5 +13395,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14036,11 +14121,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14049,16 +14134,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14067,5 +14152,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14329,5 +14414,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15051,14 +15136,14 @@ msgstr "Сгради" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15090,5 +15175,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15145,5 +15230,5 @@ msgstr "CadastreGrabber: Невалидно url." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15151,5 +15236,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15158,5 +15243,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Избери от..." @@ -15164,17 +15249,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Избор на комуна" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Кадастър" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Авто-определяне източници" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15183,13 +15268,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15214,13 +15299,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Избор на Tableau d'Assemblage" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15276,5 +15366,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15285,13 +15375,13 @@ msgstr "вода" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15339,5 +15429,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15345,26 +15435,26 @@ msgstr "адрес" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Включване автоматично кеширане." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Макс. размер на кеша (в MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15382,9 +15472,9 @@ "данни създадени с това разширение." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Френски кадастров WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15392,10 +15482,10 @@ "източници е включено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Източник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15404,5 +15494,5 @@ "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15412,129 +15502,134 @@ "текстове на тъмни фонове." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Позволяване на подреждане в няколко слоя" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Фиксирана площ (по подразбиране 100m2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фиксирана размер (от 25 до 1000 метра)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Най-старите файлове автоматично се изтриват когато този размер се премине" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15542,5 +15637,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15941,4 +16036,39 @@ msgid "TCX Files (*.tcx)" msgstr "файлове TCX (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Сваляне на обект..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Свали от OSM по дължина на тази следа" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Сваляне на добавка" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Моля изберете поне един тип данни за сваляне." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Грешка при разбор {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16028,5 +16158,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16109,5 +16239,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Обновяване" @@ -16668,30 +16798,31 @@ msgstr "Измервания" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16809,13 +16940,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17328,9 +17459,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17373,5 +17499,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17399,10 +17525,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18587,47 +18713,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18866,14 +18992,50 @@ msgstr "Пресичащи се пътища" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Повтарящи се точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Този тест проверява за точки, които се намират на едно и също място." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Повтарящи се точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Повтарящи се точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Повтарящи се точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Повтарящи се точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Повтарящи се точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Повтарящи се точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Възли в една и съща позиция" @@ -19028,59 +19190,59 @@ msgstr "Припокриващи се пътища / линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19957,9 +20119,9 @@ msgstr "Невалиден URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Сваляне на видимите квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -19968,46 +20130,46 @@ "разделителната способност." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Смяна разделителна способност" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Презареждане грешни квадранти" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Алфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Запис на WMS слоя във файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Запис на слоя WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Зареждане на WMS слой от файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Четене на WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Грешка във формата на файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Грешка при зареждане на файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -20152,398 +20314,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "граница" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "сегмент напред" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "линия" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Мултиполигон" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Мрежа" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "карта на обществен транспорт" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Ограничения" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "маршрут" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "място" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "водоеми" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Обновяване" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20607,11 +20664,17 @@ "openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Свали от OSM по дължина на тази следа" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Дублира път с отместване." #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20620,20 +20683,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "Сваляне GPS точки от Globalsat dg100 дата логер директно в JOSM." #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Предоставя фонов слой, показващ мрежа на картата." #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20646,10 +20709,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Помага за векторизиране на WMS изображения." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20658,5 +20721,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20669,15 +20732,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20686,5 +20749,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20697,15 +20760,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Показва OpenLayers фоново изображение" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Вкарва проблеми от OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20715,5 +20778,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20723,5 +20786,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20730,5 +20793,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20739,10 +20802,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великият JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20750,15 +20813,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Позволява на други приложения да изпращат команди към JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20768,5 +20831,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20775,10 +20838,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Предоставя маршрутизиращи възможности." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20787,5 +20850,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20796,15 +20859,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволява добавянето на маркери/възли на текущата gps позиция." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Предоставя диалог за редактиране на маркери в табличен вид." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20818,10 +20881,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Създава терасовидни къщи от един блок." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20830,5 +20893,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20837,5 +20900,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20844,10 +20907,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20859,5 +20922,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20867,5 +20930,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20874,15 +20937,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20891,5 +20954,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27484,8 +27547,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "линия" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "второстепенна линия" @@ -32849,4 +32916,177 @@ msgstr "плаж" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "маршрут" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "граница" + #. color deprecated #. @@ -33364,4 +33604,7 @@ msgid "Sicily - Italy" msgstr "Сицилия - Италия" + +#~ msgid "closedway" +#~ msgstr "затворен път" #~ msgid "" @@ -34094,7 +34337,4 @@ #~ msgstr "Всички линии бяха празни" -#~ msgid "Please select at least one task to download" -#~ msgstr "Моля изберете поне един тип данни за сваляне." - #~ msgid "Merge nodes with different memberships?" #~ msgstr "Обединяване точки от различни релации?" @@ -34237,7 +34477,4 @@ #~ msgstr "" #~ "Задаване ръчно на Ламбертова зона (напр. за местоположения между две зони)" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Избор на Tableau d'Assemblage" #~ msgid "Auto-tag source added:" Index: applications/editors/josm/i18n/po/cs.po =================================================================== --- applications/editors/josm/i18n/po/cs.po (revision 22464) +++ applications/editors/josm/i18n/po/cs.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-10 08:18+0000\n" -"Last-Translator: Jezevec \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-26 07:36+0000\n" +"Last-Translator: hanoj \n" "Language-Team: Czech \n" "MIME-Version: 1.0\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: 2010-07-11 18:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Nápoveda" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Parametr \"downloadgps\" neakceptuje jména souborů nebo URL" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -235,8 +235,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -246,13 +246,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -268,5 +269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -275,5 +276,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -290,13 +292,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Zrušit" @@ -357,11 +359,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -408,6 +410,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -435,5 +438,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -557,5 +560,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -617,6 +620,6 @@ msgstr "Prosím zvolte minimálně dvě cesty ke spojení" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -625,9 +628,9 @@ msgstr "Kopírovat" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Vybrat označené objekty pro vložení." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Prosím zvol něco ke kopírování" @@ -661,6 +664,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -729,5 +732,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Oddělit vrstvu" @@ -747,5 +750,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Typ objektu:" @@ -756,5 +759,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID objektu:" @@ -799,5 +802,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplikovat" @@ -946,25 +949,25 @@ msgstr "Nenalezen žádný průnik. Nic se nemění." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Přidány body na všechny průsečíky" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Opravit relace." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Spojena plocha překrývající sama sebe" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Spojeny překrývající se plochy" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -974,33 +977,33 @@ "tímto nedošlo ke vzniku chyb." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Zadej hodnoty pro všechny konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Opravit konflikty značek" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Prvek odstraněn z relací" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Spojit plochy: Vymazat krátké cesty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Uzavřená cesta" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Odstranit tagy z vnitřních cest" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Funkce spojení ploch" @@ -1019,5 +1022,5 @@ msgstr "Spojit uzly a linie" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Beze zkratky" @@ -1369,6 +1372,6 @@ msgstr "Prosím zvolte cesty s úhlem přibližně 90 nebo 180 stupňů" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1379,17 +1382,17 @@ msgstr "Vložit" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Vložit ze schránky" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Smazat nekompletní členy?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Vložte bez nekompletních členů" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1398,14 +1401,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Vložit Popisky" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1415,5 +1418,5 @@ msgstr[2] "Vkládám {0} tagů" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1483,5 +1486,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1492,12 +1495,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1524,6 +1527,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Chyba" @@ -1551,5 +1554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Uložit" @@ -1980,4 +1983,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Stahuji data" @@ -2449,4 +2453,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2773,5 +2778,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filtrovat" @@ -2976,5 +2981,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2995,9 +3000,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3099,5 +3104,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dvojí konflikt" @@ -3196,5 +3201,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3208,5 +3213,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Potvrďte smazání" @@ -3398,11 +3403,42 @@ msgstr "Vlastnosti " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Role v relaci odkazující na" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatická korekce popisků" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Chyba při získávání souborů z adresáře {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Přepsat staré záložní soubory?" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Chyba při vytváření cache adresáře: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3609,5 +3645,5 @@ msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3615,5 +3651,5 @@ msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3653,5 +3689,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3692,6 +3728,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3704,5 +3739,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3715,7 +3749,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3934,7 +3967,7 @@ msgstr "Neptat se příště (zapamatovat si volbu)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3942,29 +3975,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "nekompletní" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "silnice" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "železnice" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vodní tok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "využití oblasti (landuse)" @@ -3972,7 +4005,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3985,5 +4018,5 @@ msgstr[2] "{0} uzlů" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "veřejná doprava" @@ -4042,6 +4075,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4049,6 +4082,6 @@ msgstr "budova" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4058,5 +4091,5 @@ msgstr[2] "{0} prvků" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4131,5 +4164,5 @@ msgstr "Objekt smazán" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4230,69 +4263,69 @@ msgstr "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "použití" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Zobrazí tuto nápovědu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standardní unixová geometrie okna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Stáhnout ohraničující box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 -msgid "Select with the given search" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Launch in maximized mode" msgstr "Spustit přes celou obrazovku" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Nastavit výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Nastavit jazyk" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +msgid "options provided as Java system properties" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/CESTA/K/ADRESARI/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Změnit adresář pro všechna uživatelská nastavení" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4302,9 +4335,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "příklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4314,46 +4347,62 @@ "pořadí." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Inicializace" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Aktualizuji pluginy..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Instaluji aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Načítám dřívější pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Nastavuji výchozí hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Vytváří se grafické rozhraní programu (GUI)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Načítám pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Vyřešit" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Soubor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4372,10 +4421,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4383,10 +4432,11 @@ msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Předvolby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4397,5 +4447,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Zvuk" @@ -4675,5 +4725,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4691,5 +4741,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4902,5 +4952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Nahoru" @@ -5128,6 +5178,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5142,6 +5192,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5202,17 +5252,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Zrušit řešení konfliktů" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Aplikovat vyřešené konflikty" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5283,20 +5333,22 @@ msgstr "Konflikt ve vložených tazích" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Vložit ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Z ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "Do ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5306,5 +5358,5 @@ msgstr[2] "{0} tagů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5317,5 +5369,5 @@ msgstr[2] "{0} cest" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5382,5 +5434,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Hodnota:" @@ -5492,5 +5544,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Detaily" @@ -5895,5 +5947,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvořit kopii relace a otevřít ji v novém okně" @@ -5976,5 +6028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6183,5 +6235,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Otevřít" @@ -7034,5 +7086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7610,5 +7662,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7741,5 +7793,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7801,26 +7853,26 @@ msgstr "({0}/{1}): Stahuji relaci ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Značky a Členové" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Rodičovské relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Potomci relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplikovat roli:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Zadat roli, která se aplikuje na vybrané členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7832,14 +7884,14 @@ "provést s touto cyklickou závislostí?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Odstranit, vyčistit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorovat, ponechat relaci jak je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7851,9 +7903,9 @@ "''{0}''

Opravdu chcete přidat dalšího člena relace?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Více členů odkazuje na stejný prvek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7866,10 +7918,10 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7877,5 +7929,5 @@ "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7885,5 +7937,5 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7893,20 +7945,20 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor relací: Odstranit vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7915,64 +7967,64 @@ msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Vybrat prvky pro vybrané členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Seřadit členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Řadit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor relací: Třídění" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Obrátí pořadí členů relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Obrátit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor relací: Obrátit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Přesunout zvolené členy nahoru" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor relací: Posun nahoru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Přesunout zvolené členy dolů" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor relací: Posun dolů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Odstranit vybrané členy z relace" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor relací: Odstranit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Smazat editovanou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7981,23 +8033,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Ano, vytvořit konflikt a zavřít" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Ne, pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8006,5 +8058,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8013,50 +8065,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplikovat aktuální změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Aplikovat změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Zrušit změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Přidat prázdnou značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Stáhnout všechny nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Stáhnout prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor relací: Stáhnout členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Stáhnout vybrané nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Nastaví roli pro vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aplikovat roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8065,27 +8117,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Ano, aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Ne, neaplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Potvrdit prázdnou roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upravit relaci na kterou odkazuje vybraný člen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8423,5 +8481,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9927,12 +9985,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Stáhnout data z OSM podél této trasy" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Stáhnout vše v rozmezí:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9940,8 +10002,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maximální plocha na požadavek:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9965,4 +10029,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10414,10 +10479,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Smazat obrázek z disku" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10426,5 +10491,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Soubor s obrázkem nebylo možné smazat." @@ -12660,5 +12725,5 @@ msgstr "Přidat nový tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12667,53 +12732,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Více informací o tomto přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Dostupné role" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "role" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "počet" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Volitelné atributy:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "uzavřená cesta" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Neznámý typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12723,15 +12784,15 @@ msgstr "Nelze načíst zdroj přednastavených tagů: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Chyba parsování {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekty typu {0} nejsou podporovány." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12742,18 +12803,18 @@ msgstr[2] "Změnit {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -12768,4 +12829,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Hledání: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Hledat objekty" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Zobrazovat lokalizované názvy v seznamu prvků" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Hledání: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13481,5 +13566,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13491,10 +13576,10 @@ msgstr "Soubory z OSM serveru" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "Při ukládání došlo k chybě.
Chyba:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13504,5 +13589,5 @@ "Došlo k chybě při obnovování zálohy souboru.
Chyba:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14248,11 +14333,11 @@ msgstr "Stahuji seznam pluginů..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Stahuji seznam pluginů z ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14261,16 +14346,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14279,5 +14364,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14558,5 +14643,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15276,14 +15361,14 @@ msgstr "Budovy" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Ulice" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15315,5 +15400,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Vybrat Feuille" @@ -15372,5 +15457,5 @@ msgstr "CadastreGrabber: Neplatné URL." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15378,5 +15463,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15387,5 +15472,5 @@ "nebo byla akce přerušena" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Vyberte z..." @@ -15393,17 +15478,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Vybrat commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Katastr" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15416,13 +15501,13 @@ "Chcete používat F11 pro grabování pluginem?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15447,13 +15532,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15509,5 +15598,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15518,13 +15607,13 @@ msgstr "voda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15572,5 +15661,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15578,26 +15667,26 @@ msgstr "adresa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Zapnout automatické cachování." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Max. velikost cache (v MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15609,19 +15698,19 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS francouzského katastru" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Zdroj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15630,5 +15719,5 @@ "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15638,129 +15727,134 @@ "texty na tmavém pozadí." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Povolit skládání více vrstev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Zobrazovat rámeček kolem dat stažených z WMS serveru." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Rozlišení obrázku:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Vysoké rozlišení (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Střední rozlišení (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Nízké rozlišení (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Fixní velikost čtverce (výchozí je 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixní velikost (od 25 do 1000 metrů)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Vrstvy:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Parcely." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Čísla parcel, jména ulic." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "adresy, čísla domů." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Sekce a podsekce katastru." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Administrativní hranice samospráv." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Nejstarší soubory jsou automaticky smazány při překročení této velikosti" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15768,5 +15862,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16172,4 +16266,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX Soubory (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Stáhnout objekt..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Vybrat ke stažení dat z OSM ve vybrané oblasti." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Stáhnout nyní" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Prosím zvol aspoň jeden úkol ke stažení" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1}: Spouští se {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Chyba při čtení {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16259,5 +16388,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16340,5 +16469,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Obnovit" @@ -16896,30 +17025,31 @@ msgstr "Měření" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -17039,13 +17169,13 @@ msgstr "Fronta" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "offline" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "online" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17554,9 +17684,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17601,5 +17726,5 @@ msgstr "Vrátit zpět sadu změn #{0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17627,10 +17752,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18829,47 +18954,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "Obnovit objekt..." -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "Obnovit objekt podle id" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "Vyberte, pokud se mají data přidat do nové vrstvy" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "Zadejte ID objektu, který má být obnoven" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "Obnovit objekt" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "Obnovit objekt" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "Začít obnovování" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "Zavřít dialog a zrušit" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "Dostanu {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "Hledám {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19105,14 +19230,50 @@ msgstr "Zkřížené cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Duplicitní uzly" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Sloučit duplicitní body?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Duplicitní uzly" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Duplicitní uzly" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Sloučit duplicitní body?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Duplicitní uzly" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Sloučit duplicitní body?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Uzly na stejné pozici" @@ -19270,59 +19431,59 @@ msgstr "Překrývající se cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "Neznámý typ relace" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "Relace je prázdná" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "Role {0} chybí" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "Problém při kontrole rolí" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "Počet rolí {0} je příliš nízký ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "Počet rolí {0} je příliš vysoký ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "Role {0} neznáma" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "Nalezena prázdná role" @@ -20193,9 +20354,9 @@ msgstr "Neplatné URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Nahrát viditelné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20203,46 +20364,46 @@ "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Změnit rozlišení" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Znovu nahrát chybné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Uložit WMS vrstvu do souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Uložit WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Nahrát WMS vrstvu ze souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Načíst vrstvu WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Chyba formátu souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Chyba při nahrávání souboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Nastavit záložku WMS" @@ -20387,231 +20548,127 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "vytvořit relaci associatedStreet" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "hranice" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Vzestupně" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "vedení" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "multipolygon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Síť" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "veřejná doprava" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Omezení" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "cesta" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "místo" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vodní tok" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "Všechny soubory" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "Zrušit dialog na vybrání souboru." #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "Vytvořit nový adresář" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "Smazat soubor" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "Zadejte jméno souboru:" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "Zadejte cestu nebo jméno adresáře:" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "Chyba " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -20619,90 +20676,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "Název souboru:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "Název souboru:" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "Soubory" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "Soubory typu:" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "Soubory typu:" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "Filtr:" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "Adresáře" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "Hledat v:" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "Hledat v:" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "Změněno" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "Nový adresář" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "Otevřít vybraný soubor." #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "Přejmenovat soubor" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -20710,75 +20767,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "Uložit do:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "Uložit do:" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "Uložit vybraný soubor." #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "Výběr:" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "Velikost" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "O úroveň výše" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "Aktualizovat" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "Aktualizovat výpis adresáře." #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "Modrá:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "Jméno barvy:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "Zelená:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "Odstín:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "Červená:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "Sytost:" @@ -20841,11 +20898,17 @@ "org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Stáhnout data z OSM podél této trasy" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Plugin Duplikovat_cestu" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20856,20 +20919,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM." #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Vizualizuje informace o směrování v podobě grafu." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20879,5 +20942,5 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" @@ -20886,5 +20949,5 @@ #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20893,5 +20956,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20904,15 +20967,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20923,5 +20986,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20934,15 +20997,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Zobrazuje na pozadí obrázek z OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje problémy z OpenStreetBugs." #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20951,5 +21014,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20958,5 +21021,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20965,5 +21028,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20974,10 +21037,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ohromný JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20985,15 +21048,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Umožní jiné aplikace posílat příkazy do JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Plugin pro vracení sad změn zpět (revert)" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21003,5 +21066,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21012,10 +21075,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Poskytuje směrování" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21024,5 +21087,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21033,15 +21096,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Umožní přidat ukazatele/body na současnou GPS polohu." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Poskytuje dialog umožňující editovat tagy v tabulce." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21051,10 +21114,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Vytváření řadových domků z jednotlivých bloků." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21063,5 +21126,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21072,5 +21135,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21081,10 +21144,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "Umožňuje obnovování smazaných objektů z OSM databáze" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21095,5 +21158,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21103,5 +21166,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21112,15 +21175,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Snadné stahovaní velmi dlouhých propojených cest" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Vyberte sekvenci nevětvících se spojených cest" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21129,5 +21192,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21656,5 +21719,5 @@ #: build/trans_presets.java:587 build/trans_presets.java:605 msgid "Passing Places" -msgstr "" +msgstr "Výhybny" #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)" @@ -23012,5 +23075,5 @@ #: build/trans_presets.java:680 msgid "Passing Place" -msgstr "" +msgstr "Výhybna" #. item "Waypoints/Passing Place" @@ -23018,5 +23081,5 @@ #: build/trans_presets.java:682 msgid "Edit Passing Place" -msgstr "" +msgstr "Upravit výhybnu" #. item "Waypoints/Passing Place" label "Edit Passing Place" @@ -24136,5 +24199,5 @@ #: build/trans_presets.java:1288 msgid "Buffer Stop" -msgstr "" +msgstr "Zarážedlo" #. item "Transport/Railway/Buffer Stop" @@ -27723,8 +27786,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "vedení" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "vedlejší vedení" @@ -33088,4 +33155,177 @@ msgstr "pláž" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "cesta" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "hranice" + #. color deprecated #. @@ -33604,4 +33844,7 @@ msgstr "Sicily - Itálie" +#~ msgid "closedway" +#~ msgstr "uzavřená cesta" + #~ msgid "Email" #~ msgstr "E-mail" @@ -33612,7 +33855,4 @@ #~ msgid "Data Layer" #~ msgstr "Vrstva dat" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení" #~ msgid "JOSM Online Help" Index: applications/editors/josm/i18n/po/da.po =================================================================== --- applications/editors/josm/i18n/po/da.po (revision 22464) +++ applications/editors/josm/i18n/po/da.po (revision 22465) @@ -9,6 +9,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 17:18+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 19:58+0000\n" "Last-Translator: Esben Damgaard \n" "Language-Team: Dansk \n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:50+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -24,11 +24,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Hjælp" @@ -41,5 +41,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -72,7 +72,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ msgstr "Parameter \"downloadgps\" accepterer ikke filnavne eller fil-URL'er" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -235,8 +235,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -246,13 +246,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -268,5 +269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -275,5 +276,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -290,13 +292,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Annuller" @@ -357,11 +359,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -408,6 +410,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -435,5 +438,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -557,5 +560,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -618,6 +621,6 @@ msgstr "Vælg mindst to veje at kombinere." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -626,9 +629,9 @@ msgstr "Kopier" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopier valgte objekter til udklipsholderen." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Vælg venligst noget at kopiere." @@ -663,6 +666,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -731,5 +734,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separat lag" @@ -749,5 +752,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objekttype:" @@ -758,5 +761,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objekt ID:" @@ -801,5 +804,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplikér" @@ -947,25 +950,25 @@ msgstr "Intet skæringspunkt fundet. Intet blev ændret." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Tilføjede punkter ved alle skæringspunkter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Slet veje, som ikke er dele af en indre multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Ret relationer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Forbandt selv-overlappende område" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Forbandt overlappende områder" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -975,33 +978,33 @@ "venligst at ingen nye fejl er blevet introduceret." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Indtast værdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Løs tag konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Fjernede element fra relationer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Sammenlæg områder: Fjern korte veje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Lukket vej" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Fjern tags fra indre veje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Funktion til sammenlægning af områder" @@ -1020,5 +1023,5 @@ msgstr "Forbind punkt og linje" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Ingen genvej" @@ -1375,6 +1378,6 @@ msgstr "Vælg venligst veje med vinkler på cirka 90 eller 180 grader." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1385,17 +1388,17 @@ msgstr "Indsæt" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Indsæt indhold af udklipsholderen." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Slet ufuldstændige medlemmer?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Indsæt uden ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1407,14 +1410,14 @@ "ufuldstændige primitiver?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Indsæt tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Tilføj tags i udklipsholderen til alle valgte elementer." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1423,5 +1426,5 @@ msgstr[1] "Indsætter {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1490,5 +1493,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1499,12 +1502,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1531,6 +1534,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Fejl" @@ -1558,5 +1561,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Gem" @@ -1978,4 +1981,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Download data" @@ -2449,4 +2453,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2779,5 +2784,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -2984,5 +2989,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3003,9 +3008,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3108,5 +3113,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dobbelt konflikt" @@ -3203,5 +3208,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3215,5 +3220,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Bekræftelse af sletning" @@ -3401,11 +3406,42 @@ msgstr "Egenskaber for " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Roller i relationer refererende til" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatisk tag-rettelse" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Fejl ved hentning af filer fra mappen {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Slet gammel udvidelsesfil {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Fejl ved oprettelse af mellemlager-mappe: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3629,5 +3665,5 @@ msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3637,5 +3673,5 @@ "allerede er inkluderet" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3678,5 +3714,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3721,6 +3757,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3732,5 +3767,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3742,7 +3776,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3965,7 +3998,7 @@ msgstr "Vis ikke igen (husker valg)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3973,29 +4006,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "ufuldstændig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "landevej" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "jernbane" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vandvej" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "brug af jord" @@ -4003,7 +4036,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4015,5 +4048,5 @@ msgstr[1] "{0} punkter" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "Offentlig transport" @@ -4072,6 +4105,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4079,6 +4112,6 @@ msgstr "bygning" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4087,5 +4120,5 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4160,5 +4193,5 @@ msgstr "Objekt slettet" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4260,69 +4293,69 @@ msgstr "Adgangskode" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "brug" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "valgmuligheder" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Vis denne hjælp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standard unix geometrisk argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Download afgrænsningsfeltet" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Download stedet fra URL'en (med lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "Åbn en fil (enhver filtype der kan åbnes med Fil/Åbn)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Download afgrænsningsfeltet som rå gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Download stedet ved URL'en (med bredde=x&længde=y&zoom=z) som rå GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Vælg med den givne søgning" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Start op i maksimeret tilstand" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Nulstil indstillingerne til standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Indstil sproget" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "options givet som Java systemegenskaber" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/STI/TIL/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Ændr folderen for alle bruger indstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4336,9 +4369,9 @@ "megabytes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4346,46 +4379,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Initialiserer" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Opdaterer plugins..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Installerer opdaterede plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Henter indledende udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Sætter standardværdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Opretter hovedgrænseflade" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Henter udvidelser" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Løs" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Filer" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4404,10 +4453,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4415,10 +4464,11 @@ msgstr "Funktioner" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Fordefinerede" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4429,5 +4479,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Lyd" @@ -4703,5 +4753,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4719,5 +4769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4944,5 +4994,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Op" @@ -5169,6 +5219,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5183,6 +5233,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5243,17 +5293,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Afbryd løsning af konflikt" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Anvend løste konflikter" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5325,20 +5375,22 @@ msgstr "Konflikter i indsatte tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Indsæt ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Fra ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "Til ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5347,5 +5399,5 @@ msgstr[1] "{0} tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5357,5 +5409,5 @@ msgstr[1] "{0} veje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5424,5 +5476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Værdi:" @@ -5546,5 +5598,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Detaljer" @@ -5950,5 +6002,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6032,5 +6084,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6239,5 +6291,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Åbn" @@ -7094,5 +7146,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7691,5 +7743,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7820,5 +7872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7877,26 +7929,26 @@ msgstr "({0}/{1}): Downloader relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags og medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Forældrerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Barnerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Anvend rolle:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Indtast en rolle og brug den med de markerede relationsmedlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7908,14 +7960,14 @@ "
Hvordan ønsker du at fortsætte med cirkulære afhængigheder?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Fjern dem og ryd op i relationen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorer dem og lad relationen være som den er." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7928,9 +7980,9 @@ "relationsmedlem?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Flere medlemmer der refererer til samme primitiv." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7943,5 +7995,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7949,5 +8001,5 @@ "Tilføj alle primitiver markeret i det nuværende datasæt før det første medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7956,5 +8008,5 @@ "medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7964,5 +8016,5 @@ "markerede medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7972,15 +8024,15 @@ "markerede medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Fjern alle medlemmer der refererer til en af de markerede primitiver" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relationseditor: Fjern markerede" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7989,5 +8041,5 @@ "markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7998,64 +8050,64 @@ "markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Markér primitiver for markerede relationsmedlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sortér relationsmedlemmerne" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sortér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relationseditor: Sortér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reversér relationsmedlemmernes rækkefølge" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Omvendt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relationseditor: Reversér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Flyt de nu markerede medlemmer op" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relationseditor: Flyt op" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Flyt de nu markerede medlemmer ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relationseditor: Flyt ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Fjern de nu markerede medlemmer fra denne relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relationseditor: Fjern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Slet den redigerede relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8064,23 +8116,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Ja, opret en konflikt og luk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Klik for at oprette en konflikt og lukke denne relationseditor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Nej, fortsæt redigeringen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8092,5 +8144,5 @@ "oprette en konflikt og lukke editoren?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8101,50 +8153,50 @@ "venligst denne konflikt først og prøv så igen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Tilføj de aktuelle opdateringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Tilføj opdateringerne og luk dialogboksen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Annullér opdateringerne og luk dialogen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Tilføj en tom tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Download alle ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relationseditor: Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Download markerede ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Giver de markerede medlemmer en rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Anvend rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8153,27 +8205,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Vil du virkelig anvende den nye rolle?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Ja, anvend den" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Nej, anvend den ikke" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Bekræft tom rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Redigér den relation det nu markerede relationsmedlem refererer til" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8518,5 +8576,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10037,12 +10095,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Download fra OSM langs dette spor" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Download alt indenfor:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10050,8 +10112,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maksimum område per anmodning:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10075,4 +10139,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10525,10 +10590,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Slet billedfil fra disk" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10539,5 +10604,5 @@ "h3>" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Billedfilen kunne ikke slettes" @@ -12815,5 +12880,5 @@ msgstr "Tilføj en ny tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12822,53 +12887,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Mere information om denne feature" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Valgfri attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "lukketvej" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Ukendt type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12878,15 +12939,15 @@ msgstr "Kunne ikke læse kilde med fordefinerede tags: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Fejl ved fortolkning af {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementer af typen {0} er understøttet." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12896,18 +12957,18 @@ msgstr[1] "Ret {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Markering uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Anvend fordefinition" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Ret egenskaber" @@ -12922,4 +12983,28 @@ msgid "Preset group {0}" msgstr "Fordefinitionsgruppe {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Søg: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Søg efter objekter." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Vis lokaliseret navn i markeringslister" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Søg: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13657,5 +13742,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13667,10 +13752,10 @@ msgstr "OSM-serverfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13679,5 +13764,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14409,11 +14494,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14422,16 +14507,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14440,5 +14525,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14727,5 +14812,5 @@ "

Fejlmeddelelsen er:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15455,14 +15540,14 @@ msgstr "Bygninger" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15494,5 +15579,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Vælg Feuille" @@ -15551,5 +15636,5 @@ msgstr "CadastreGrabber: Ugyldig URL." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15557,5 +15642,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15564,5 +15649,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Vælg fra..." @@ -15570,17 +15655,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Vælg kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Autokilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15589,13 +15674,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM er stoppet for at ændring skal have effekt." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15620,13 +15705,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Slå billedbeskæring fra under geo-referencering." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15682,5 +15771,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15691,13 +15780,13 @@ msgstr "vand" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15745,5 +15834,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15751,26 +15840,26 @@ msgstr "adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Slå automatisk caching til." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Maks. cachestørrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15782,18 +15871,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Fransk Cadastre-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15803,5 +15892,5 @@ "defineret i JOSM-indstillingerne." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15811,128 +15900,133 @@ "Nyttigt for tekster på sorte baggrunde." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Tegn et rektangel omkring downloadet data fra WMS-server." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hent mindre billeder (højere kvalitet men kræver mere hukommelse)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1.000 meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Ældste filer bliver automatisk slettet, når denne størrelse overskrides." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15940,5 +16034,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16338,4 +16432,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX Filer (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Download objekt..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Download kortdata ved enden af den markerede vej" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Download nu" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Vælg mindst én opgave til download" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1}: Starter {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Fejl ved fortolkning af {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16425,5 +16554,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16506,5 +16635,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Opdater" @@ -17050,30 +17179,31 @@ msgstr "Mål" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Michigan venstre" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "Ikke i stand til at finde via punkter. Tjek venligst din markering" @@ -17192,13 +17322,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17705,9 +17835,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17750,5 +17875,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17776,10 +17901,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18963,47 +19088,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19241,10 +19366,16 @@ msgstr "Krydsende veje" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Dublet-punkter" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" @@ -19252,5 +19383,35 @@ "sted." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Dublet-punkter" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Dublet-punkter" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Dublet-punkter" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Dublet-punkter" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Dublet-punkter" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Dublet-punkter" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -19410,59 +19571,59 @@ msgstr "Overlappende veje" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20354,9 +20515,9 @@ msgstr "Ugyldig URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Download synlige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20365,46 +20526,46 @@ "opløsningen." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Skift opløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Genhent fejlagtige tern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alpha-kanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Gem WMS-lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Gem WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Indlæs WMS-lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Indlæs WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-filversion ikke understøttet; fandt {0}, forventede {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Fil format fejl" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Fejl ved indlæsning af fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Sæt WMS-bogmærke" @@ -20550,398 +20711,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "grænse" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Forøgelse:" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "linie" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolygon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Netværk" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "Offentlig transport" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Beskrivelse" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "rute" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "sted" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vandvej" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Opdatér" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -21005,11 +21061,17 @@ "openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Download fra OSM langs dette spor" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21020,5 +21082,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -21026,15 +21088,15 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Stil et baggrundslag til rådighed, der viser et kortnet" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21047,10 +21109,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Hjælper med at vektorisere WMS-billeder." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21060,5 +21122,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21071,15 +21133,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21090,5 +21152,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21098,15 +21160,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Viser et OpenLayers baggrundsbillede" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer sager fra OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21115,5 +21177,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21122,5 +21184,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21129,5 +21191,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -21138,10 +21200,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21149,15 +21211,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Tillad andre applikationer at sende kommandoer til JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21167,5 +21229,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21176,10 +21238,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Tilføjer ruteplan-egenskaber" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21188,5 +21250,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21197,15 +21259,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Stiller en dialog til redigering af tags i tabelform til rådighed" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21218,10 +21280,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Laver rækkehuse ud af en enkelt blok." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21230,5 +21292,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21237,5 +21299,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21244,10 +21306,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21258,5 +21320,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21266,5 +21328,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21275,15 +21337,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21292,5 +21354,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27885,10 +27947,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "linie" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "motorvejsforbindelse" #. item "Man Made/Power Line" combo "Voltage" @@ -33250,4 +33316,177 @@ msgstr "strand" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "rute" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "grænse" + #. color deprecated #. @@ -33766,4 +34005,7 @@ msgstr "Sicilen - Italien" +#~ msgid "closedway" +#~ msgstr "lukketvej" + #~ msgid "Move" #~ msgstr "Flyt" @@ -34253,7 +34495,4 @@ #~ msgid "Enable proxy server" #~ msgstr "Aktiver proxyserver" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Vælg mindst én opgave til download" #~ msgid "Way ''{0}'' with less than two points." @@ -35111,7 +35350,4 @@ #~ msgstr "" -#~ msgid "Delete old plugin file {0}" -#~ msgstr "Slet gammel udvidelsesfil {0}" - #~ msgid "The plugin could not be removed. Probably it was already disabled" #~ msgstr "" Index: applications/editors/josm/i18n/po/de.po =================================================================== --- applications/editors/josm/i18n/po/de.po (revision 22464) +++ applications/editors/josm/i18n/po/de.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-09 09:43+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-12 14:23+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Hilfe" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Der Parameter \"downloadgps\" unterstützt keine Dateinamen oder URLs." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -235,8 +235,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -246,13 +246,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -268,5 +269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -275,5 +276,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -290,13 +292,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Abbrechen" @@ -359,11 +361,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -410,6 +412,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -437,5 +440,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -559,5 +562,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -621,6 +624,6 @@ msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -629,9 +632,9 @@ msgstr "Kopieren" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Gewählte Objekte in die Zwischenablage kopieren." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Bitte etwas zum Kopieren auswählen." @@ -666,6 +669,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -734,5 +737,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separate Ebene" @@ -752,5 +755,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objekttyp:" @@ -761,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objekt ID:" @@ -804,5 +807,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplizieren" @@ -952,25 +955,25 @@ msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Knoten auf allen Schnittpunkten erstellt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Wege entfernen, die nicht Teil des inneren Multipolygons sind" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Relationen korrigieren" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Selbstüberlappende Gebiete verbunden" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Überlappende Gebiete verbunden" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -980,33 +983,33 @@ "prüfen Sie, dass keine Fehler entstanden sind." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Werte für alle Konflikte festlegen." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Merkmalskonflikte beheben" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Element aus Relationen entfernt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Flächen verbinden: Kurze Wege entfernen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Weg geschlossen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Merkmale von inneren Wegen entfernen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Funktion zum Flächen verbinden" @@ -1025,5 +1028,5 @@ msgstr "Knotenpunkt und Linie vereinigen" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Kein Tastenkürzel" @@ -1389,6 +1392,6 @@ msgstr "Bitte Wege mit Winkel von ungefähr 90 oder 180 Grad auswählen." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1399,17 +1402,17 @@ msgstr "Einfügen" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Inhalt der Zwischenablage einfügen." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Unvollständige Elemente entfernen?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Beim Einfügen die unvollständigen Elemente weglassen" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1420,14 +1423,14 @@ "und die kopierten Daten ohne die unvollständigen Objekte einfügen?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Merkmale einfügen" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1436,5 +1439,5 @@ msgstr[1] "{0} Merkmale einfügen" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1503,5 +1506,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1512,12 +1515,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1544,6 +1547,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Fehler" @@ -1571,5 +1574,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Speichern" @@ -2000,4 +2003,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Daten herunterladen" @@ -2491,4 +2495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2829,5 +2834,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -3043,5 +3048,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3062,9 +3067,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3167,5 +3172,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doppelter Konflikt" @@ -3264,5 +3269,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3276,5 +3281,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Löschbestätigung" @@ -3465,11 +3470,42 @@ msgstr "Eigenschaften von " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Rollen in Relationen beziehen sich auf" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatische Merkmalskorrektur" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Alte Sicherungsdateien überschreiben?" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Fehler beim Erstellen des Speichers: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3700,5 +3736,5 @@ msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3708,5 +3744,5 @@ "enthalten ist" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3757,5 +3793,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3802,6 +3838,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3813,5 +3848,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3823,7 +3857,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4051,7 +4084,7 @@ msgstr "Nicht noch einmal zeigen (speichert Auswahl)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4059,29 +4092,29 @@ msgstr " [ID: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "unvollständig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "Straße" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "Eisenbahn" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "Gewässer" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "Landfläche" @@ -4089,7 +4122,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4101,5 +4134,5 @@ msgstr[1] "{0} Knoten" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "Öffentliche Verkehrsmittel" @@ -4158,6 +4191,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4165,6 +4198,6 @@ msgstr "Gebäude" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4173,5 +4206,5 @@ msgstr[1] "{0} Elemente" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4246,5 +4279,5 @@ msgstr "Objekt gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4349,70 +4382,70 @@ msgstr "Passwort" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "Verwendung" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "Optionen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Diese Hilfe anzeigen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standard Unix Geometrie Argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Bounding Box herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" +"Eine Datei öffnen (jeder Dateityp, welcher von Datei/Öffnen unterstützt wird)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" -"Eine Datei öffnen (jeder Dateityp, welcher von Datei/Öffnen unterstützt wird)" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Bounding Box als GPS-Spuren herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "GPS-Daten am Ort der URL (mit lat=x&lon=y&zoom=z) herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Mit der angegebenen Suche auswählen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Mit maximiertem Fenster starten" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Die Einstellungen auf Standardwerte zurücksetzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Sprache einstellen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "Optionen über die Java-Systemeinstellungen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PFAD/ZU/JOSM/ORDNER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Verzeichnis für alle Benutzereinstellungen ändern" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4426,9 +4459,9 @@ "festgelegt werden." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "Beispiele" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4438,47 +4471,63 @@ "Reihenfolge verarbeitet." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" "Stellen Sie sicher, dass sie Daten laden, falls Sie --selection verwenden." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Initialisieren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Plugins aktualisieren..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Aktualisierte Plugins installieren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Zeitige Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Voreinstellungen setzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Hauptfenster erzeugen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Auflösen" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Datei" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4497,10 +4546,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4508,10 +4557,11 @@ msgstr "Werkzeuge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Vorlagen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4522,5 +4572,5 @@ msgstr "Menü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4807,5 +4857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4823,5 +4873,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5047,5 +5097,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Hoch" @@ -5272,6 +5322,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5286,6 +5336,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5346,17 +5396,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Konfliktlösung abbrechen" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Übernehme gelöste Konflikte" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5428,20 +5478,22 @@ msgstr "Konflikte in eingefügten Merkmalen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Einfügen..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Von..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "Nach..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5450,5 +5502,5 @@ msgstr[1] "{0} Merkmale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5460,5 +5512,5 @@ msgstr[1] "{0} Wege" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5528,5 +5580,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Wert:" @@ -5656,5 +5708,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Details" @@ -6065,5 +6117,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6148,5 +6200,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6362,5 +6414,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Offen" @@ -7217,5 +7269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7832,5 +7884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7961,5 +8013,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8019,27 +8071,27 @@ msgstr "({0}/{1}: Relation ''{2}'' herunterladen..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Merkmale und Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Eltern-Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Kind-Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Rolle anwenden:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" "Eine Rolle eingeben und diese auf die gewählten Relationselemente anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8051,14 +8103,14 @@ "Sie die zirkuläre Abhängigkeit behandeln?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Objekt entfernen und Verbindung lösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorieren und die aktuelle Verbindung belassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8070,9 +8122,9 @@ "

Wollen Sie es ein weiteres Mal in die Relation aufnehmen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Mehrere Elemente verweisen auf das gleiche Objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8085,5 +8137,5 @@ "Relation ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8092,5 +8144,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8099,5 +8151,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8107,5 +8159,5 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8115,20 +8167,20 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relations-Editor: Ausgewählte entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Alle Elemente auswählen, die in der aktuellen Auswahl vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8139,64 +8191,64 @@ "vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Objekte für gewählte Relationselemente auswählen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Relationselemente sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relations-Editor: Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Die Reihenfolge der Relationselemente umdrehen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Umkehren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relationseditor: Umkehren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Ausgewählte Elemente nach oben schieben" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relations-Editor: Nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Ausgewählte Elemente nach unten schieben" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relations-Editor: Nach unten verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Das ausgewählte Element aus dieser Relation entfernen" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relations-Editor: Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Diese Relation löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8208,10 +8260,10 @@ "Relationselemente gelöscht." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Konflikt erstellen und schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" @@ -8219,10 +8271,10 @@ "schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8230,5 +8282,5 @@ "Relation wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8240,5 +8292,5 @@ "

Soll ein Konflikt erstellt und der Editor geschlossen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8249,50 +8301,50 @@ "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aktualisierung übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Updates anwenden und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Updates abbrechen und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Einen leeren Schlüssel hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Alle unvollständigen Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relations-Editor: Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Ausgewählte unvollständige Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Definiert eine Rolle für die ausgewählten Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Rolle anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8301,27 +8353,33 @@ msgstr[1] "Eine leere Rolle wird {0} Objekten zugewiesen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Dies ist equivalent zum Löschen der Rollen für diese Objekte." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Soll die neue Rolle wirklich zugewiesen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Nicht übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Leere Rolle bestätigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8672,5 +8730,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10267,12 +10325,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "OSM-Daten entlang der GPS-Spur herunterladen" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Alles im Bereich herunterladen:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10280,8 +10342,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maximalgebiet je Anfrage:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10305,4 +10369,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10762,10 +10827,10 @@ msgstr[1] "{0} wurden als GPS-markiert erkannt." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Bilddatei von der Platte löschen" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10776,5 +10841,5 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Bilddatei konnte nicht gelöscht werden." @@ -13207,5 +13272,5 @@ msgstr "Neues Merkmal hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -13216,53 +13281,49 @@ "''display_values'' muss mit der Anzahl in ''values'' identisch sein." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Mehr Informationen zu dieser Vorlage" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "Unbekannte Vorraussetzung: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Verfügbare Rollen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "Rolle" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "Anzahl" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "Elemente" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Optionale Attribute:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "geschlossener Weg" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Unbekannter Typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "Vorlagenelement Rolle ohne Vorgänger" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "Vorlagenelement ohne Elternelement" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -13272,15 +13333,15 @@ msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Fehler beim Einlesen von {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente des Typs {0} werden unterstützt." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13290,18 +13351,18 @@ msgstr[1] "Ändere {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -13316,4 +13377,28 @@ msgid "Preset group {0}" msgstr "Vorlagengruppe {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Suche: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Nach Objekten suchen" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Übersetzten Namen in Auswahllisten anzeigen" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Suche: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -14086,5 +14171,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -14096,5 +14181,5 @@ msgstr "OSM-Server-Dateien" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" @@ -14103,5 +14188,5 @@ "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -14112,5 +14197,5 @@ "
Der Fehler lautet:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14904,11 +14989,11 @@ msgstr "Lade Plugin-Liste herunter..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Herunterladen der Plugin-Liste von ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14919,16 +15004,16 @@ "Kann die Plugin-Liste der Quelle ''{1}'' nicht zwischenspeichern." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Schreibe Plugin-Liste in den lokalen Zwischenspeicher ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Lese Plugin-Liste von Quelle ''{0}'' ein" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14939,5 +15024,5 @@ "wird ausgelassen. Die Fehlermeldung war: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -15279,5 +15364,5 @@ "

Die Fehlermeldung lautet:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16119,14 +16204,14 @@ msgstr "Gebäude" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "Nächste Nummer" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Straße" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "Adressen eingeben" @@ -16163,5 +16248,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Feuille auswählen" @@ -16220,5 +16305,5 @@ msgstr "CadastreGrabber: Ungültige URL." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -16228,5 +16313,5 @@ "Der Server befindet sich im Wartungsmodus oder ist kurzzeitig überlastet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -16237,5 +16322,5 @@ "oder Aktion abgebrochen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Wähle aus..." @@ -16243,17 +16328,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Wähle eine Kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Automatische Quellenangabe" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -16266,13 +16351,13 @@ "Wollen Sie wieder zum Bilder holen nutzen?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Tastaturkürzel wiederherstellen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM wird zum Aktivieren der Änderung beendet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -16299,17 +16384,20 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "Erste WMS-Ebene in Liste wählen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" -"Keine Relationen für Adressen nutzen (sondern \"addr:street\" auf Knoten)." +"Keine Relation für Adressen nutzen (sondern \"addr:street\" an Elementen)." #. item "Man Made/Pipeline" combo "Type" @@ -16363,5 +16451,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -16372,13 +16460,13 @@ msgstr "Wasser" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "Symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "Paket" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "Paketnummer" @@ -16426,5 +16514,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -16432,26 +16520,26 @@ msgstr "Adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "Ortschaft" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "Abschnitt" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "Gemeinde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Automatischen Zwischenspeicher aktivieren." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Max. Speichergröße (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16469,19 +16557,19 @@ "dieses Plugins erstellt wurden, hochladen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Französisches Kataster-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Quelle" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16491,5 +16579,5 @@ "Hintergrundfarbe ersetzen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16499,9 +16587,9 @@ "Nützlich für Texte auf dunklen Hintergründen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Stapeln mehrerer Schichten erlauben" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16509,120 +16597,125 @@ "durchsichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Bildauflösung:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Hohe Auflösung (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Mittlere Auflösung (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Niedrige Auflösung (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Bildfilter Interpolierung" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Nächster Nachbar (am schnellsten) [ Standard ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilinear (schnell)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bikubisch (langsam)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Multiplikator für Vektordaten:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Ein Vollbild holen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Feste Quadratgröße (Standard ist 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Feste Größe (von 25 bis 1000 Meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Ebenen:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "Seen, Flüsse, Swimmingpools" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Gebäude, Bedeckung, unterirdische Konstruktionen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Symbole, wie christliche Kreuze." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Grundstücke." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Grundstücknummern, Strassennamen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Adressen, Hausnummern" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Ortschaft, Weiler, Stätte" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Katasterabschnitt und -unterabschnitt" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Administrative Gemeindegrenzen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Multiplikator für Pixelgrafiken:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Anzeige der Querstücke:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Alte Dateien werden automatisch gelöscht, wenn diese Größe überschritten wird" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16632,5 +16725,5 @@ "sind." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "Aktivieren, um den Schlüssel \"addr:street\" auf Knoten zu nutzen." @@ -17056,4 +17149,41 @@ msgid "TCX Files (*.tcx)" msgstr "TCX-Dateien (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Objekt herunterladen..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Kartendaten mit Anschluss zu einem der Wegenden herunterladen" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Jetzt herunterladen" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "" +"Bitte wählen Sie 4 oder 5 Wege aus, damit Links-Abbiege-Verbote bestimmt " +"werden können." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1}: {2} starten" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Fehler beim Parsen von {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -17143,5 +17273,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "Externe Skript in JOSM nutzen" @@ -17224,5 +17354,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Aktualisieren" @@ -17783,13 +17913,14 @@ msgstr "Messungen" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Michigan Left" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" @@ -17797,19 +17928,19 @@ "werden können." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Bitte wählen Sie 4 Wege aus, die eine geschlossene Relation bilden." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" "Die Wege können nicht geordnet werden. Bitte überprüfen Sie die Richtungen." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Erstelle Michigan Links-Abbiege-Beschränkungen" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -17936,13 +18067,13 @@ msgstr "Warteschlange" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "Abgemeldet" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "Angemeldet" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -18455,9 +18586,4 @@ msgstr "Fehlendes Vereinigungsziel für {0} mit ID {1}" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "Ziel vom Typ {0} mit ID {1} hat ungültige Version" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18504,5 +18630,5 @@ msgstr "Änderungssatz {0} umkehren" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "Verkehrszeichen Plugin" @@ -18530,10 +18656,10 @@ msgstr "Fehler beim Parsen der Tagging-Vorlage aus ''{0}'':\n" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "Zeichen {0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19806,47 +19932,47 @@ msgstr "Gehe zum Standard-Editor und wähle einen Weg" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "Objekt wiederherstellen..." -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "Objekt mittels ID wiederherstellen" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "Auswählen, ob die Daten in eine neue Ebene gespeichert werden sollen" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "ID des wiederherzustellenden Objekts eingeben" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "Objekt wiederherstellen" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "Objekt wiederherstellen" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "Wiederherstellen starten" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "Dialog schließen und abbrechen" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "Erhalte {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "Suche nach {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -20086,14 +20212,50 @@ msgstr "Überschneidende Wege" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Doppelte Knoten" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Dieser Test prüft auf doppelte Knoten an der selben Stelle." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Doppelten Knoten zusammenführen?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Doppelte Knoten" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Doppelte Knoten" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Doppelten Knoten zusammenführen?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Doppelte Knoten" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Doppelten Knoten zusammenführen?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Knoten auf derselben Position" @@ -20255,59 +20417,59 @@ msgstr "Überlappende Wege" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "Relationsprüfer :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "Diese Erweiterung prüft auf Fehler in Relationen." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "Relationstyp unbekannt" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "Relation ist leer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "Rolle {0} fehlt" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "Problem bei Rollenprüfung" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "Anzahl der {0}-Rollen ist zu klein ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "Anzahl der {0}-Rollen ist zu hoch ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "Element für Rolle {0} hat falschen Typ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "Rolle {0} unbekannt" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "Leere Rolle gefunden" @@ -21214,9 +21376,9 @@ msgstr "Ungültige URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Sichtbare Kacheln laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21225,46 +21387,46 @@ "die Auflösung" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Auflösung ändern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Fehlerhafte Kacheln neu laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alphakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "WMS-Ebene in Datei speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "WMS-Ebene speichern" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "WMS-Ebene aus Datei laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "WMS-Ebene laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Dateiformatfehler" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Fehler beim Laden der Datei" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "WMS-Lesezeichen erstellen" @@ -21412,231 +21574,127 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "Eine Straßenzugehörigkeitsrelation erzeugen" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "Grenze" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Erhöhen" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Freileitung (Starkstrom)" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "Multipolygon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Netzwerk" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "Öffentliche Verkehrsmittel" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Einschränkung" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "Route" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Örtlichkeit" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "Gewässer" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "Alle Dateien" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "Attribute" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "Dialogfeld für Dateiauswahl abbrechen" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "Dateiauswahldialog abbrechen." #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "Neuen Ordner erstellen" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "Datei löschen" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "Dateiname eingeben:" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "Pfad oder Ordnername eingeben:" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "Fehler " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -21644,90 +21702,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "Dateiname:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "Dateiname:" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "Hilfe für FileChooser." #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "Dateien" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "Dateityp:" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "Dateityp:" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "Filter:" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "Ordner" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "Home" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "Liste" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "Suchen in:" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "Suchen in:" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "Geändert" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "Neuer Ordner" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "Die gewählte Datei öffnen" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "Gewählte Datei öffnen." #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "Datei umbenennen" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -21735,75 +21793,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "Speichern in:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "Speichern in:" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "Gewählte Datei speichern." #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "Auswahl:" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "Größe" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "Eine Ebene höher" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "Aktualisieren" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "Verzeichnisinhalt aktualisieren." #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "Blau:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "Name der Farbe:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "Grün:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "Farbton:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "GTK Farbauswahl" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "Rot:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "Sättigung:" @@ -21873,11 +21931,17 @@ "openstreetmap.org hoch." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "OSM-Daten entlang der GPS-Spur herunterladen" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Wege mit einem Versatz duplizieren." #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21888,5 +21952,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -21894,15 +21958,15 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Visualisiert Routeninformationen als Routengraph." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Erstellt eine Hintergrundebene, die ein Kartennetz anzeigt" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21915,10 +21979,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Hilfe beim Vektorisieren von WMS-Bildern." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21928,5 +21992,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21939,15 +22003,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Fügt Abbiegeverbote nach links für 4 oder 5 ausgewählte Wege hinzu" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Ein Gebiet einfach in ein Multipolygon umwandeln." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21958,5 +22022,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21969,15 +22033,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Zeigt ein OpenLayers-Hintergrundbild" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importiert Berichte von OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21987,5 +22051,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21994,5 +22058,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -22003,5 +22067,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -22012,10 +22076,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Das großartige Plastic-Design von JGoodies." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -22025,15 +22089,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Erlaubt anderen Programmen, Kommandos an JOSM zu senden." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Plugin zum Umkehren von Änderungssätzen" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -22047,5 +22111,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22056,10 +22120,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Bietet Routenführungsmöglichkeiten." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22071,5 +22135,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22080,15 +22144,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS-Position einzufügen." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22101,10 +22165,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Erstellt Reihenhäuser aus einem Häuserblock." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22115,5 +22179,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22124,5 +22188,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22133,10 +22197,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22148,5 +22212,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22159,5 +22223,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22169,15 +22233,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Eine Reihe von nichtverzweigenden verbundenen Wegen auswählen" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22188,5 +22252,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -28783,8 +28847,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "Freileitung (Starkstrom)" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "Freileitung (Schwachstrom)" @@ -34148,4 +34216,177 @@ msgstr "Strand" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "Route" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "Grenze" + #. color deprecated #. @@ -34663,4 +34904,10 @@ msgid "Sicily - Italy" msgstr "Sizilien - Italien" + +#~ msgid "closedway" +#~ msgstr "geschlossener Weg" + +#~ msgid "Target of type {0} with id {1} has invalid version" +#~ msgstr "Ziel vom Typ {0} mit ID {1} hat ungültige Version" #~ msgid "Create non-audio markers when reading GPX." Index: applications/editors/josm/i18n/po/el.po =================================================================== --- applications/editors/josm/i18n/po/el.po (revision 22464) +++ applications/editors/josm/i18n/po/el.po (revision 22465) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" "PO-Revision-Date: 2010-04-20 18:36+0000\n" "Last-Translator: bastik \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Βοήθεια" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Η παράμετρος \"downloadgps\" δεν δέχεται ονόματα ή URL αρχείων" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -228,8 +228,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -239,13 +239,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -261,5 +262,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -268,5 +269,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -283,13 +285,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Ακύρωση" @@ -348,11 +350,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -399,6 +401,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -426,5 +429,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -548,5 +551,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -608,6 +611,6 @@ msgstr "Παρακαλώ επιλέξτε τουλάχιστον δυο διαδρομές προς σύνδεση." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -616,9 +619,9 @@ msgstr "Αντιγραφή" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Αντιγραφή επιλεγμένων αντικειμένων στο πρόχειρο." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Παρακαλώ επιλέξτε κάτι για αντιγραφή." @@ -653,6 +656,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -722,5 +725,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Ξεχωριστό Επίπεδο" @@ -740,5 +743,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Τύπος αντικειμένου:" @@ -749,5 +752,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Αναγνωριστικό Αντικειμένου (ID):" @@ -792,5 +795,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Αντιγραφή" @@ -944,25 +947,25 @@ msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Προστέθηκε κόμβος σε όλες τις διασταυρώσεις" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Δίορθωση σχέσεων" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -970,33 +973,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Εισάγετε τιμές για όλες τισ διενέξεις." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Επίλυση διενέξεων" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Διόρθωση συγκρούσεων ετικετών" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Αφαιρέθηκε στοιχείο από Σχέσεις" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Λειτουργία ένωσης περιοχών" @@ -1015,5 +1018,5 @@ msgstr "Ένωση Κόμβου και Γραμμής" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Καμοία συντόμευση" @@ -1363,6 +1366,6 @@ "Παρακαλώ επιλέξτε διαδρομές με γωνίες που πλησιάζουν τις 90 ή τις 180 μοίρες." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1373,17 +1376,17 @@ msgstr "Επικόλληση" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Επικόληση περιεχομένων πρόχειρου." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Διαγραφή ατελών μελών;" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1392,14 +1395,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Επικόλληση ετικετών" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1408,5 +1411,5 @@ msgstr[1] "Επικόληση {0} ετικετών" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1475,5 +1478,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1484,12 +1487,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1516,6 +1519,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Σφάλμα" @@ -1543,5 +1546,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Αποθήκευση" @@ -1960,4 +1963,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Μεταφόρτωση δεδομένων" @@ -2429,4 +2433,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2740,5 +2745,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Φίλτρο" @@ -2933,5 +2938,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2952,9 +2957,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "Εντάξει" @@ -3055,5 +3060,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Διπλή διένεξη" @@ -3146,5 +3151,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3158,5 +3163,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3340,11 +3345,42 @@ msgstr "Ιδιότητες του " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Ρόλοι σε σχέσεις που αναφέροντε στο" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Αυτόματη διόρθωση ετικέτας" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Σφάλμα κατά την δημιουργία καταλόγου cache: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3546,5 +3582,5 @@ msgstr "Α" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3552,5 +3588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3590,5 +3626,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3629,6 +3665,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3640,5 +3675,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3650,7 +3684,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3868,7 +3901,7 @@ msgstr "Να μην εμφανιστεί ξανά (απομνημόνευση επιλογής)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3876,29 +3909,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "μη ολοκληρωμένη" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "Οδός ταχείας κυκλοφορίας" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "σιδηρόδρομος" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "υδατοδιαδρομή" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "χρήση γής" @@ -3906,7 +3939,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3918,5 +3951,5 @@ msgstr[1] "{0} κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "μέσα μαζικής μεταφοράς" @@ -3975,6 +4008,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3982,6 +4015,6 @@ msgstr "κτίριο" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3990,5 +4023,5 @@ msgstr[1] "{0} μέλη" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4063,5 +4096,5 @@ msgstr "Το αντικείμενο διαγράφηκε" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4158,69 +4191,69 @@ msgstr "Κωδικός" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "χρήση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "Επιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Εμφάνιση αυτής της βοήθειας" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +msgid "Standard unix geometry argument" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" +msgid "Download the bounding box" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 -msgid "Download the bounding box" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "Επιλογή με την δοθείσα αναζήτηση" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +msgid "Launch in maximized mode" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Reset the preferences to default" msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Επιλογή γλώσσας" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +msgid "options provided as Java system properties" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4230,9 +4263,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "παραδείγματα" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4242,46 +4275,62 @@ "αυτή τη σειρά." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Αρχικοποίηση" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Ενημέρωση πρόσθετων..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Εγκατάσταση ενημερωμένων πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Ρύθμιση προκαθορισμένων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Δημιουργία κύριου GUI" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Φόρτωση πρόσθετων" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Επίλυση" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Αρχείο" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4300,10 +4349,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Προβολή" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4311,10 +4360,11 @@ msgstr "Εργαλεία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Προεπιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4325,5 +4375,5 @@ msgstr "Μενού: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Ήχος" @@ -4590,5 +4640,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4606,5 +4656,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4811,5 +4861,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "" @@ -5027,6 +5077,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5041,6 +5091,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5101,17 +5151,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5182,20 +5232,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5204,5 +5256,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5214,5 +5266,5 @@ msgstr[1] "{0} διαδρομές" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5278,5 +5330,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5380,5 +5432,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5782,5 +5834,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5863,5 +5915,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6066,5 +6118,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6917,5 +6969,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7485,5 +7537,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<διαφορετικά>" @@ -7615,5 +7667,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7670,26 +7722,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7698,14 +7750,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7715,9 +7767,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7727,15 +7779,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7743,5 +7795,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7749,20 +7801,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7771,64 +7823,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Αντιστροφή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7837,23 +7889,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7862,5 +7914,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7869,50 +7921,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7921,26 +7973,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8278,5 +8336,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9708,12 +9766,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Λήψη όλων εντός:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9721,8 +9783,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Μέγιστη περιοχή ανά αίτημα:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9746,4 +9810,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10178,10 +10243,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10190,5 +10255,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12370,5 +12435,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12377,53 +12442,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Άγνωστος τύπος: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12433,15 +12494,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Σφάλμα ανάλυσης {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Υποστηρίζονται στοιχεία τύπου {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12451,18 +12512,18 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Τίποτα επιλεγμένο!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Εφαρμογή Προεπιλογής" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Αλλαγή ιδιοτήτων" @@ -12477,4 +12538,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Αναζήτηση: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Αναζήτηση αντικειμένων." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Ζουμ στην επιλογή" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Αναζήτηση: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13178,5 +13263,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13188,10 +13273,10 @@ msgstr "Αρχεία Διακομιστή OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13200,5 +13285,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13926,11 +14011,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13939,16 +14024,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13957,5 +14042,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14216,5 +14301,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14935,14 +15020,14 @@ msgstr "Κτήρια" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14974,5 +15059,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15029,5 +15114,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15035,5 +15120,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15042,5 +15127,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Επιλέξτε από..." @@ -15048,17 +15133,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15067,13 +15152,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15098,13 +15183,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15160,5 +15249,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15169,13 +15258,13 @@ msgstr "νερό" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15223,5 +15312,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15229,26 +15318,26 @@ msgstr "διεύθυνση" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15260,18 +15349,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Πηγή" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15281,5 +15370,5 @@ "προτιμήσεις του JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15287,129 +15376,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Ρύθμιση διαφάνειας επιπέδων WMS. Δεξιά για αδιαφανές, αριστερά για διαφανές." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Τα παλαιότερα αρχεία διαγράφονται αυτόματα όταν ξεπεραστεί αυτό το μέγεθος" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15417,5 +15511,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15811,4 +15905,41 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Λήψη αντικειμένου..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Λήψη Πρόσθετου" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "" +"Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον " +"τέσσερις κόμβους." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Φόρτωση {0}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15898,5 +16029,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15979,5 +16110,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Ανανέωση" @@ -16532,30 +16663,31 @@ msgstr "Μετρήσεις" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16671,13 +16803,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17181,9 +17313,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17226,5 +17353,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17252,10 +17379,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18435,47 +18562,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18712,14 +18839,50 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Αφαίρεση διπλών κόμβων..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Αφαίρεση διπλών κόμβων..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Αφαίρεση διπλών κόμβων..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Αφαίρεση διπλών κόμβων..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Αφαίρεση διπλών κόμβων..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Αφαίρεση διπλών κόμβων..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18872,59 +19035,59 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19783,9 +19946,9 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Λήψη εμφανών πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -19793,46 +19956,46 @@ "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Αλλαγή ανάλυσης" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Ανανέωση λανθασμένων πλακιδίων" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Κανάλι άλφα" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Αποθήκευση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Φόρτωση επιπέδου WMS από αρχείο" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Φόρτωση επιπέδου WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Σφάλμα μορφής αρχείου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Σφάλμα φόρτωσης αρχείου" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19977,398 +20140,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "όριο" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Μετρήσεις" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Αγωγός" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "<πολλαπλές>" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Δίκτυο" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "μέσα μαζικής μεταφοράς" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Περιορισμός" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "διαδρομή" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Επικόλληση" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "υδατοδιαδρομή" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Ενημέρωση" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20425,11 +20483,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20438,20 +20502,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20461,10 +20525,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20472,5 +20536,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20480,15 +20544,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20497,5 +20561,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20505,15 +20569,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Εισάγει προβλήματα από OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20521,5 +20585,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20527,5 +20591,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20534,5 +20598,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20541,10 +20605,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20552,15 +20616,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20570,5 +20634,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20577,10 +20641,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Παρέχει δυνατότητες δρομολόγησης." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20589,5 +20653,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20596,15 +20660,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20614,10 +20678,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20626,5 +20690,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20633,5 +20697,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20640,10 +20704,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20652,5 +20716,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20660,5 +20724,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20670,15 +20734,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20687,5 +20751,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27280,8 +27344,11 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Αγωγός" #: build/trans_presets.java:2452 +msgctxt "Power Line" msgid "minor_line" msgstr "" @@ -32645,4 +32712,177 @@ msgstr "παραλία" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "διαδρομή" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "όριο" + #. color deprecated #. @@ -33818,9 +34058,4 @@ #~ "επίπεδο δεδομένων;" -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "" -#~ "Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον " -#~ "τέσσερις κόμβους." - #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "" @@ -33886,7 +34121,4 @@ #~ msgstr "Άνοιγμα εικόνων με το AgPifoJ..." -#~ msgid "" -#~ msgstr "<πολλαπλές>" - #~ msgid "Continue anyway" #~ msgstr "Συνέχεια έτσι κι αλλιώς" Index: applications/editors/josm/i18n/po/en_AU.po =================================================================== --- applications/editors/josm/i18n/po/en_AU.po (revision 22464) +++ applications/editors/josm/i18n/po/en_AU.po (revision 22465) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" "PO-Revision-Date: 2010-06-15 17:47+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: 2010-07-11 18:51+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Help" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Parameter \"downloadgps\" does not accept file names or file URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -234,8 +234,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -245,13 +245,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -267,5 +268,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -274,5 +275,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -289,13 +291,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Cancel" @@ -356,11 +358,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -407,6 +409,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -434,5 +437,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -556,5 +559,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -618,6 +621,6 @@ msgstr "Please select at least two ways to combine." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -626,9 +629,9 @@ msgstr "Copy" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Copy selected objects to paste buffer." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Please select something to copy." @@ -663,6 +666,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -731,5 +734,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separate Layer" @@ -749,5 +752,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Object type:" @@ -758,5 +761,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Object ID:" @@ -801,5 +804,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicate" @@ -947,25 +950,25 @@ msgstr "No intersection found. Nothing was changed." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Added node on all intersections" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Delete Ways that are not part of an inner multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Fix relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Joined self-overlapping area" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Joined overlapping areas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -975,33 +978,33 @@ "verify no errors have been introduced." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Enter values for all conflicts." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Solve Conflicts" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Fix tag conflicts" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Removed Element from Relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Join Areas: Remove Short Ways" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Closed Way" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Remove tags from inner ways" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Join Areas Function" @@ -1020,5 +1023,5 @@ msgstr "Join Node and Line" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "No Shortcut" @@ -1379,6 +1382,6 @@ msgstr "Please select ways with angles of approximately 90 or 180 degrees." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1389,17 +1392,17 @@ msgstr "Paste" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Paste contents of paste buffer." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Delete incomplete members?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Paste without incomplete members" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1411,14 +1414,14 @@ "incomplete primitives?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Paste Tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Apply tags of contents of paste buffer to all selected items." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1427,5 +1430,5 @@ msgstr[1] "Pasting {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1494,5 +1497,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1503,12 +1506,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1535,6 +1538,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Error" @@ -1562,5 +1565,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Save" @@ -1985,4 +1988,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Download data" @@ -2459,4 +2463,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2784,5 +2789,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -2986,5 +2991,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3005,9 +3010,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3110,5 +3115,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Double conflict" @@ -3204,5 +3209,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3216,5 +3221,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Delete confirmation" @@ -3402,11 +3407,42 @@ msgstr "Properties of " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Roles in relations referring to" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatic tag correction" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Error while getting files from directory {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Override old backup files?" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Error creating cache directory: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3631,5 +3667,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3638,5 +3674,5 @@ "Unable to add primitive {0} to the dataset because it is already included" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3679,5 +3715,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3723,6 +3759,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3734,5 +3769,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3744,7 +3778,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3967,7 +4000,7 @@ msgstr "Do not show again (remembers choice)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3975,29 +4008,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incomplete" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "highway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "railway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "waterway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "landuse" @@ -4005,7 +4038,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4017,5 +4050,5 @@ msgstr[1] "{0} nodes" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "public transport" @@ -4074,6 +4107,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4081,6 +4114,6 @@ msgstr "building" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4089,5 +4122,5 @@ msgstr[1] "{0} members" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4162,5 +4195,5 @@ msgstr "Object deleted" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4261,69 +4294,69 @@ msgstr "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Show this help" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standard unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Download the bounding box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "Open a file (any file type that can be opened with File/Open)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Download the bounding box as raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Select with the given search" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Launch in maximised mode" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Reset the preferences to default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Set the language" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "options provided as Java system properties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Change the folder for all user settings" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4337,9 +4370,9 @@ "megabytes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "examples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4349,46 +4382,62 @@ "order." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Make sure you load some data if you use --selection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Initialising" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Updating plug-ins..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Installing updated plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Loading early plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Setting defaults" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Creating main GUI" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Loading plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Resolve" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4407,10 +4456,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4418,10 +4467,11 @@ msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4432,5 +4482,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4712,5 +4762,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4728,5 +4778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4947,5 +4997,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Up" @@ -5169,6 +5219,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5183,6 +5233,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5243,17 +5293,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Cancel conflict resolution" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Apply resolved conflicts" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5324,20 +5374,22 @@ msgstr "Conflicts in pasted tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Paste ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "From ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "To ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5346,5 +5398,5 @@ msgstr[1] "{0} tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5356,5 +5408,5 @@ msgstr[1] "{0} ways" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5422,5 +5474,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Value:" @@ -5540,5 +5592,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Details" @@ -5946,5 +5998,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Create a copy of this relation and open it in another editor window" @@ -6027,5 +6079,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6234,5 +6286,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Open" @@ -7089,5 +7141,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7690,5 +7742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7819,5 +7871,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7876,26 +7928,26 @@ msgstr "({0}/{1}): Downloading relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags and Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Parent Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Child Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Apply Role:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Enter a role and apply it to the selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7907,14 +7959,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Remove them, clean up relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignore them, leave relation as is" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7927,9 +7979,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7942,5 +7994,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7948,5 +8000,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7954,5 +8006,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7962,5 +8014,5 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7970,15 +8022,15 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove all members referring to one of the selected primitives" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relation Editor: Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7986,5 +8038,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7995,64 +8047,64 @@ "selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Select primitives for selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sort the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reverse the order of the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relation Editor: Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relation Editor: Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relation Editor: Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Remove the currently selected members from this relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relation Editor: Remove" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8064,23 +8116,23 @@ "was open. They have been removed from the relation members list." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Click to create a conflict and close this relation editor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Click to return to the relation editor and to resume relation editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8092,5 +8144,5 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8101,50 +8153,50 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Download all incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Download selected incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Sets a role for the selected members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8153,27 +8205,33 @@ msgstr[1] "You are setting an empty role on {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "This is equal to deleting the roles of these primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Do you really want to apply the new role?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, do not apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Edit the relation the currently selected relation member refers to" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8515,5 +8573,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10063,12 +10121,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Download from OSM along this track" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Download everything within:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10076,8 +10138,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maximum area per request:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10101,4 +10165,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10552,10 +10617,10 @@ msgstr[1] "{0} were found to be GPS tagged." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Delete image file from disk" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10566,5 +10631,5 @@ "permanently lost!" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Image file could not be deleted." @@ -12914,5 +12979,5 @@ msgstr "Add a new tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12923,53 +12988,49 @@ "be the same as in values" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "More information about this feature" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Optional Attributes:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "closed way" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Unknown type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12979,15 +13040,15 @@ msgstr "Could not read tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Error parsing {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elements of type {0} are supported." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12997,18 +13058,18 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Change Properties" @@ -13023,4 +13084,28 @@ msgid "Preset group {0}" msgstr "Preset group {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Search: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Search for objects." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Show localised name in selection lists" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Search: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13766,5 +13851,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13776,10 +13861,10 @@ msgstr "OSM Server Files" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "An error occurred while saving.
Error is:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13790,5 +13875,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14564,11 +14649,11 @@ msgstr "Download plug-in list..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Downloading plug-in list from ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14579,16 +14664,16 @@ "list from plug-in site ''{1}''." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Writing plug-in list to local cache ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Parsing plug-in list from site ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14599,5 +14684,5 @@ "Exception was: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14923,5 +15008,5 @@ "

The error message is:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15663,14 +15748,14 @@ msgstr "Buildings" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Street" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15705,5 +15790,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Select Feuille" @@ -15762,5 +15847,5 @@ msgstr "CadastreGrabber: Illegal url." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15770,5 +15855,5 @@ "Server in maintenance or temporary overloaded." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15779,5 +15864,5 @@ "or action cancelled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Choose from..." @@ -15785,17 +15870,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Select commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15807,13 +15892,13 @@ "Would you like to restore F11 for grab action ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Restore grab shortcut F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM is stopped for the change to take effect." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15839,13 +15924,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Disable image cropping during georeferencing." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15901,5 +15990,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15910,13 +15999,13 @@ msgstr "water" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "parcel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "parcel number" @@ -15964,5 +16053,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15970,26 +16059,26 @@ msgstr "address" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "locality" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "section" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Enable automatic caching." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Max. cache size (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16007,18 +16096,18 @@ "by this plug-in." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Value of key \"source\" when autosourcing is enabled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16028,5 +16117,5 @@ "JOSM preferences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16036,127 +16125,132 @@ "Useful for texts on dark backgrounds." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Allows multiple layers stacking" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Set WMS layers transparency. Right is opaque, left is transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Draw a rectangle around downloaded data from WMS server." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Image resolution:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "High resolution (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Medium resolution (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Low resolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Image filter interpolation:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Nearest-Neighbor (fastest) [ Default ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilinear (fast)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bicubic (slow)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Vector images grab multiplier:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Grab one image full screen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Grab smaller images (higher quality but use more memory)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Fixed size square (default is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixed size (from 25 to 1000 metres)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Layers:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "See, rivers, swimming pools." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Buildings, covers, underground constructions." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Symbols like cristian cross." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Parcels." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Parcels numbers, street names." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Address, houses numbers." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Locality, hamlet, place." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Cadastral sections and subsections." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Municipality administrative borders." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Raster images grab multiplier:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Display crosspieces:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Oldest files are automatically deleted when this size is exceeded" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16166,5 +16260,5 @@ "grabbing." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16583,4 +16677,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX Files (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Download object..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Download map data on the end of selected way" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Download now" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Please select 4 or 5 ways to assign no left turns." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1}: Starting {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Error parsing {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16670,5 +16799,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16751,5 +16880,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Refresh" @@ -17302,30 +17431,31 @@ msgstr "Measurements" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Michigan Left" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "Adds no left turn for sets of 4 or 5 ways." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "Please select 4 or 5 ways to assign no left turns." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Please select 4 ways that form a closed relation." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Unable to order the ways. Please verify their directions" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Create Michigan left turn restriction" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "Unable to find via nodes. Please check your selection" @@ -17444,13 +17574,13 @@ msgstr "Queue" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "offline" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "online" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17961,9 +18091,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18006,5 +18131,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -18032,10 +18157,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19216,47 +19341,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19495,14 +19620,50 @@ msgstr "Crossing ways" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Duplicated nodes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "This test checks that there are no nodes at the very same location." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Merge duplicate node?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Duplicated nodes" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Duplicated nodes" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Merge duplicate node?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Duplicated nodes" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Merge duplicate node?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Nodes at same position" @@ -19662,59 +19823,59 @@ msgstr "Overlapping ways" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20601,9 +20762,9 @@ msgstr "Invalid URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20611,46 +20772,46 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Error loading file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Set WMS Bookmark" @@ -20795,398 +20956,294 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "create an associatedStreet relation" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "boundary" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Increment" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "line" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolygon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Network" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "public transport" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Restriction" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "route" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "site" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "waterway" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 -msgid "Update" +msgid "Save in:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 +msgid "Update" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -21253,11 +21310,17 @@ "openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Download from OSM along this track" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Duplicate Ways with an offset" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21268,20 +21331,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM." #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Visualises routing information as a routing graph." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Provide a background layer that displays a map grid" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21294,10 +21357,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Helps vectorising WMS images." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21306,5 +21369,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21317,15 +21380,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Adds no left turn for sets of 4 or 5 ways" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21336,5 +21399,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21347,15 +21410,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Displays an OpenLayers background image" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Imports issues from OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21364,5 +21427,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21371,5 +21434,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21380,5 +21443,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -21389,10 +21452,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "The great JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21401,15 +21464,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Let other applications send commands to JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21419,5 +21482,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21428,10 +21491,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21440,5 +21503,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21449,15 +21512,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Provides a dialogue for editing tags in a tabular grid." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21470,10 +21533,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21482,5 +21545,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21491,5 +21554,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21498,10 +21561,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21512,5 +21575,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21520,5 +21583,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21529,15 +21592,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21548,5 +21611,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -28142,8 +28205,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "line" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "minor_line" @@ -33507,4 +33574,177 @@ msgstr "beach" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "route" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "boundary" + #. color deprecated #. @@ -34022,4 +34262,7 @@ msgid "Sicily - Italy" msgstr "Sicily - Italy" + +#~ msgid "closedway" +#~ msgstr "closed way" #~ msgid "" Index: applications/editors/josm/i18n/po/en_GB.po =================================================================== --- applications/editors/josm/i18n/po/en_GB.po (revision 22464) +++ applications/editors/josm/i18n/po/en_GB.po (revision 22465) @@ -11,5 +11,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" "PO-Revision-Date: 2010-05-16 13:46+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -19,5 +19,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -26,11 +26,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Help" @@ -43,5 +43,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -74,7 +74,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -106,5 +106,5 @@ msgstr "Parameter \"downloadgps\" does not accept file names or file URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -124,6 +124,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -237,8 +237,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -248,13 +248,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -270,5 +271,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -277,5 +278,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -292,13 +294,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Cancel" @@ -359,11 +361,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -410,6 +412,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -437,5 +440,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -559,5 +562,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -621,6 +624,6 @@ msgstr "Please select at least two ways to combine." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -629,9 +632,9 @@ msgstr "Copy" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Copy selected objects to paste buffer." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Please select something to copy." @@ -666,6 +669,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -734,5 +737,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separate Layer" @@ -752,5 +755,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Object type:" @@ -761,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Object ID:" @@ -804,5 +807,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicate" @@ -950,25 +953,25 @@ msgstr "No intersection found. Nothing was changed." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Added node on all intersections" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Delete Ways that are not part of an inner multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Fix relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Joined self-overlapping area" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Joined overlapping areas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -978,33 +981,33 @@ "verify no errors have been introduced." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Enter values for all conflicts." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Solve Conflicts" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Fix tag conflicts" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Removed Element from Relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Join Areas: Remove Short Ways" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Closed Way" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Remove tags from inner ways" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Join Areas Function" @@ -1023,5 +1026,5 @@ msgstr "Join Node and Line" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "No Shortcut" @@ -1382,6 +1385,6 @@ msgstr "Please select ways with angles of approximately 90 or 180 degrees." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1392,17 +1395,17 @@ msgstr "Paste" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Paste contents of paste buffer." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Delete incomplete members?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Paste without incomplete members" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1414,14 +1417,14 @@ "incomplete primitives?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Paste Tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Apply tags of contents of paste buffer to all selected items." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1430,5 +1433,5 @@ msgstr[1] "Pasting {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1497,5 +1500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1506,12 +1509,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1538,6 +1541,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Error" @@ -1565,5 +1568,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Save" @@ -1988,4 +1991,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Download data" @@ -2462,4 +2466,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2787,5 +2792,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -2989,5 +2994,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3008,9 +3013,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3113,5 +3118,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Double conflict" @@ -3207,5 +3212,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3219,5 +3224,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Delete confirmation" @@ -3405,11 +3410,42 @@ msgstr "Properties of " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Roles in relations referring to" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatic tag correction" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Error while getting files from directory {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Override old backup files?" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Error creating cache directory: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3634,5 +3670,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3641,5 +3677,5 @@ "Unable to add primitive {0} to the dataset because it is already included" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3682,5 +3718,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3726,6 +3762,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3737,5 +3772,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3747,7 +3781,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3970,7 +4003,7 @@ msgstr "Do not show again (remembers choice)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3978,29 +4011,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incomplete" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "highway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "railway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "waterway" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "landuse" @@ -4008,7 +4041,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4020,5 +4053,5 @@ msgstr[1] "{0} nodes" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "public transport" @@ -4077,6 +4110,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4084,6 +4117,6 @@ msgstr "building" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4092,5 +4125,5 @@ msgstr[1] "{0} members" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4165,5 +4198,5 @@ msgstr "Object deleted" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4264,69 +4297,69 @@ msgstr "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Show this help" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standard unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Download the bounding box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "Open a file (any file type that can be opened with File/Open)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Download the bounding box as raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Select with the given search" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Launch in maximised mode" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Reset the preferences to default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Set the language" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "options provided as Java system properties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Change the folder for all user settings" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4340,9 +4373,9 @@ "megabytes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "examples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4352,46 +4385,62 @@ "order." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Make sure you load some data if you use --selection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Initialising" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Updating plug-ins..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Installing updated plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Loading early plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Setting defaults" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Creating main GUI" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Loading plug-ins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Resolve" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4410,10 +4459,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4421,10 +4470,11 @@ msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4435,5 +4485,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4715,5 +4765,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4731,5 +4781,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4950,5 +5000,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Up" @@ -5172,6 +5222,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5186,6 +5236,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5246,17 +5296,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Cancel conflict resolution" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Apply resolved conflicts" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5327,20 +5377,22 @@ msgstr "Conflicts in pasted tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Paste ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "From ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "To ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5349,5 +5401,5 @@ msgstr[1] "{0} tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5359,5 +5411,5 @@ msgstr[1] "{0} ways" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5425,5 +5477,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Value:" @@ -5543,5 +5595,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Details" @@ -5949,5 +6001,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Create a copy of this relation and open it in another editor window" @@ -6030,5 +6082,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6237,5 +6289,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Open" @@ -7092,5 +7144,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7701,5 +7753,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7830,5 +7882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7887,26 +7939,26 @@ msgstr "({0}/{1}): Downloading relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags and Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Parent Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Child Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Apply Role:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Enter a role and apply it to the selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7918,14 +7970,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Remove them, clean up relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignore them, leave relation as is" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7938,9 +7990,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7953,5 +8005,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7959,5 +8011,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7965,5 +8017,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7973,5 +8025,5 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7981,15 +8033,15 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove all members referring to one of the selected primitives" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relation Editor: Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7997,5 +8049,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8006,64 +8058,64 @@ "selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Select primitives for selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sort the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reverse the order of the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relation Editor: Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relation Editor: Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relation Editor: Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Remove the currently selected members from this relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relation Editor: Remove" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8075,23 +8127,23 @@ "was open. They have been removed from the relation members list." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Click to create a conflict and close this relation editor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Click to return to the relation editor and to resume relation editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8103,5 +8155,5 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8112,50 +8164,50 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Download all incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Download selected incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Sets a role for the selected members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8164,27 +8216,33 @@ msgstr[1] "You are setting an empty role on {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "This is equal to deleting the roles of these primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Do you really want to apply the new role?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, do not apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Edit the relation the currently selected relation member refers to" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8526,5 +8584,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10074,12 +10132,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Download from OSM along this track" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Download everything within:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10087,8 +10149,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maximum area per request:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10112,4 +10176,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10563,10 +10628,10 @@ msgstr[1] "{0} were found to be GPS tagged." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Delete image file from disk" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10577,5 +10642,5 @@ "permanently lost!" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Image file could not be deleted." @@ -12927,5 +12992,5 @@ msgstr "Add a new tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12936,53 +13001,49 @@ "be the same as in values" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "More information about this feature" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Optional Attributes:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "closed way" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Unknown type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12992,15 +13053,15 @@ msgstr "Could not read tagging preset source: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Error parsing {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elements of type {0} are supported." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13010,18 +13071,18 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Change Properties" @@ -13036,4 +13097,28 @@ msgid "Preset group {0}" msgstr "Preset group {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Search: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Search for objects" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Show localised name in selection lists" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Search: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13779,5 +13864,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13789,10 +13874,10 @@ msgstr "OSM Server Files" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "An error occurred while saving.
Error is:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13803,5 +13888,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14577,11 +14662,11 @@ msgstr "Download plug-in list..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Downloading plug-in list from ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14592,16 +14677,16 @@ "list from plug-in site ''{1}''." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Writing plug-in list to local cache ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Parsing plug-in list from site ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14612,5 +14697,5 @@ "Exception was: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14944,5 +15029,5 @@ "

The error message is:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15684,14 +15769,14 @@ msgstr "Buildings" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Street" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15728,5 +15813,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Select Feuille" @@ -15785,5 +15870,5 @@ msgstr "CadastreGrabber: Illegal url." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15793,5 +15878,5 @@ "Server in maintenance or temporary overloaded." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15802,5 +15887,5 @@ "or action cancelled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Choose from..." @@ -15808,17 +15893,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Select commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15830,13 +15915,13 @@ "Would you like to restore F11 for grab action ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Restore grab shortcut F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM is stopped for the change to take effect." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15862,13 +15947,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Disable image cropping during georeferencing." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Select Tableau d'Assemblage" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15924,5 +16014,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15933,13 +16023,13 @@ msgstr "water" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "parcel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "parcel number" @@ -15987,5 +16077,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15993,26 +16083,26 @@ msgstr "address" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "locality" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "section" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Enable automatic caching." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Max. cache size (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16030,18 +16120,18 @@ "by this plug-in." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Value of key \"source\" when autosourcing is enabled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16051,5 +16141,5 @@ "JOSM preferences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16059,127 +16149,132 @@ "Useful for texts on dark backgrounds." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Allows multiple layers stacking" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Set WMS layers transparency. Right is opaque, left is transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Draw a rectangle around downloaded data from WMS server." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Image resolution:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "High resolution (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Medium resolution (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Low resolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Image filter interpolation:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Nearest-Neighbor (fastest) [ Default ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilinear (fast)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bicubic (slow)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Vector images grab multiplier:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Grab one image full screen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Grab smaller images (higher quality but use more memory)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Fixed size square (default is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixed size (from 25 to 1000 metres)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Layers:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "See, rivers, swimming pools." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Buildings, covers, underground constructions." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Symbols like cristian cross." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Parcels." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Parcels numbers, street names." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Address, houses numbers." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Locality, hamlet, place." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Cadastral sections and subsections." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Municipality administrative borders." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Raster images grab multiplier:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Display crosspieces:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Oldest files are automatically deleted when this size is exceeded" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16189,5 +16284,5 @@ "grabbing." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16606,4 +16701,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX Files (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Download object..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Download map data on the end of selected way" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Download now" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Please select at least one task to download" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1}: Starting {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Error parsing {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16693,5 +16823,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16774,5 +16904,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Refresh" @@ -17325,30 +17455,31 @@ msgstr "Measurements" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Michigan Left" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "Adds no left turn for sets of 4 or 5 ways." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "Please select 4 or 5 ways to assign no left turns." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Please select 4 ways that form a closed relation." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Unable to order the ways. Please verify their directions" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Create Michigan left turn restriction" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "Unable to find via nodes. Please check your selection" @@ -17467,13 +17598,13 @@ msgstr "Queue" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "offline" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "online" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17984,9 +18115,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18029,5 +18155,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -18055,10 +18181,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19259,47 +19385,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19538,14 +19664,50 @@ msgstr "Crossing ways" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Duplicated nodes" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "This test checks that there are no nodes at the very same location." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Merge duplicate node?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Duplicated nodes" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Duplicated nodes" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Merge duplicate node?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Duplicated nodes" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Merge duplicate node?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Nodes at same position" @@ -19705,59 +19867,59 @@ msgstr "Overlapping ways" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20644,9 +20806,9 @@ msgstr "Invalid URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Download visible tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20654,46 +20816,46 @@ "The requested area is too big. Please zoom in a little, or change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Change resolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Reload erroneous tiles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Save WMS layer to file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Save WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Load WMS layer from file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Load WMS layer" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Unsupported WMS file version; found {0}, expected {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "File Format Error" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Error loading file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Set WMS Bookmark" @@ -20838,398 +21000,294 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "create an associatedStreet relation" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "boundary" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Increment" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "line" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolygon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Network" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "public transport" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Restriction" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "route" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "site" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "waterway" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Update" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -21296,11 +21354,17 @@ "openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Download from OSM along this track" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Duplicate Ways with an offset" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21311,20 +21375,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM." #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Visualises routing information as a routing graph." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Provide a background layer that displays a map grid" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21337,10 +21401,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Helps vectorising WMS images." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21349,5 +21413,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21360,15 +21424,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Adds no left turn for sets of 4 or 5 ways" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Simply convert an area to a multipolygon." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21379,5 +21443,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21390,15 +21454,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Displays an OpenLayers background image" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Imports issues from OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21407,5 +21471,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21414,5 +21478,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21423,5 +21487,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -21432,10 +21496,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "The great JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21444,15 +21508,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Let other applications send commands to JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21462,5 +21526,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21471,10 +21535,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21483,5 +21547,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21492,15 +21556,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Provides a dialogue for editing tags in a tabular grid." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21513,10 +21577,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21525,5 +21589,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21534,5 +21598,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21543,10 +21607,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21557,5 +21621,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21565,5 +21629,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21574,15 +21638,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Select a sequence of non-branching connected ways" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21593,5 +21657,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -28187,8 +28251,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "line" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "minor_line" @@ -33552,4 +33620,177 @@ msgstr "beach" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "route" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "boundary" + #. color deprecated #. @@ -34068,4 +34309,7 @@ msgstr "Sicily - Italy" +#~ msgid "closedway" +#~ msgstr "closed way" + #~ msgid "Move" #~ msgstr "Move" @@ -34520,7 +34764,4 @@ #~ msgid "Only one node selected" #~ msgstr "Only one node selected" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Please select at least one task to download" #~ msgid "Really mark this issue as ''done''?" @@ -34963,7 +35204,4 @@ #~ "Set manually the Lambert zone (e.g. for locations between two zones)" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Select Tableau d'Assemblage" - #~ msgid "Lambert Zone 4 cache file (.4)" #~ msgstr "Lambert Zone 4 cache file (.4)" Index: applications/editors/josm/i18n/po/es.po =================================================================== --- applications/editors/josm/i18n/po/es.po (revision 22464) +++ applications/editors/josm/i18n/po/es.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-11 09:44+0000\n" -"Last-Translator: Emilio Gomez Fernandez \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-23 16:53+0000\n" +"Last-Translator: Jose Ernesto Davila \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: 2010-07-11 18:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Ayuda" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ "El parámetro \"downloadgps\" no acepta nombres de archivo o URLs de archivo." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -237,8 +237,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -248,13 +248,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -270,5 +271,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -277,5 +278,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -292,13 +294,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Cancelar" @@ -358,11 +360,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -409,6 +411,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -436,5 +439,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -558,5 +561,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -620,6 +623,6 @@ msgstr "Por favor seleccione al menos dos vías a combinar" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -628,9 +631,9 @@ msgstr "Copiar" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Copia los objetos seleccionados al portapapeles" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Por favor, seleccione algo que copiar." @@ -665,6 +668,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -735,5 +738,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separar capa" @@ -753,5 +756,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Tipo de objeto:" @@ -762,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID de objeto:" @@ -806,5 +809,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicar" @@ -957,25 +960,25 @@ msgstr "No se encontró ninguna intersección. Nada ha cambiado." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Nodo añadido en todas las intersecciones" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Eliminar formas que no son parte de un multipolígono interior" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Arreglar relaciones" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Fusionar área superpuesta consigo misma" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Fusionar áreas superpuestas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -985,33 +988,33 @@ "favor compruebe que errores no se han introducido." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Introduzca valores para todos los conflictos." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Resolver conflictos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Arreglar conflictos de etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Eliminar elementos de las relaciones" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Fusionar áreas: eliminar las vías cortas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Vía cerrada" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Eliminar etiquetas de vías internas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Función para la fusión de áreas" @@ -1030,5 +1033,5 @@ msgstr "Unir nodo y línea" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Sin acceso directo" @@ -1400,6 +1403,6 @@ "Por favor, seleccione formas con angulos de aproximadamente 90 y 180 grados" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1410,17 +1413,17 @@ msgstr "Pegar" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Pegar los contenidos de la memoria de pegado" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "¿Borrar los miembros incompletos?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Pegar sin los miembros incompletos" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1432,10 +1435,10 @@ "incompletos?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Pegar etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1443,5 +1446,5 @@ "elementos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1450,5 +1453,5 @@ msgstr[1] "Pegando {0} etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1517,5 +1520,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1526,12 +1529,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1558,6 +1561,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Error" @@ -1585,5 +1588,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Guardar" @@ -2008,4 +2011,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Descargar datos" @@ -2499,4 +2503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2835,5 +2840,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filtrar" @@ -2859,8 +2864,10 @@ " {0}" msgstr "" +"Expresión inválida de búsqueda: \n" +" {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 msgid "Invalid search expression" -msgstr "" +msgstr "Expresión inválida de búsqueda" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -3047,5 +3054,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3066,9 +3073,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "Aceptar" @@ -3171,5 +3178,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doble conflicto" @@ -3267,5 +3274,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3279,5 +3286,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Confirmación antes de borrar" @@ -3468,11 +3475,42 @@ msgstr "Propiedades de " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Funciones en la relaciones referidas a" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Correción automática de etiquetas" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Error mientras se obtenían archivos del directorio {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Imposible obtener ruta apropiada para el directorio {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Error al crear directorio caché: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3702,5 +3740,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3710,5 +3748,5 @@ "incluida" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3751,5 +3789,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3796,6 +3834,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3807,5 +3844,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3817,7 +3853,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4043,7 +4078,7 @@ msgstr "No mostrar otra vez (recordar elección)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4051,29 +4086,29 @@ msgstr " [ID: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "vía" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "ferrocarril" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vía fluvial" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "uso del suelo" @@ -4081,7 +4116,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4093,5 +4128,5 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "transporte público" @@ -4150,6 +4185,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4157,6 +4192,6 @@ msgstr "edificio" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4165,5 +4200,5 @@ msgstr[1] "miembros {0}" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4238,5 +4273,5 @@ msgstr "Objeto borrado" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4338,70 +4373,70 @@ msgstr "Contraseña" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "opciones" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Mostrar esta ayuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Argumento de geometría standard de unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Bajar el rectángulo límite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" +"Abrir archivo (cualquier tipo de archivo que puede abrirse con Archivo/Abrir)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" -"Abrir archivo (cualquier tipo de archivo que puede abrirse con Archivo/Abrir)" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Bajar el rectángulo límite como gps en bruto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Descargar datos GPS desde URL (con lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Seleccionar dentro de la búsqueda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Lanzar en modo maximizado" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Restablecer las preferencias a los valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Definir idioma" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "opciones proporcionadas como propiedades de sistema Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Cambiar la carpeta para todas las configuraciones de usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4415,9 +4450,9 @@ "en megabytes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "ejemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4427,46 +4462,62 @@ "esta orden." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Hay que cargar algún dato si se usa --selección." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Inicializar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Actualizando complementos..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Instalando complementos actualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Cargando los primeros complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Ajustes predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Creando la interfaz principal de usuario" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Cargando los complementos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Resolver" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Archivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4485,10 +4536,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4496,10 +4547,11 @@ msgstr "Herramientas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Predefinidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4510,5 +4562,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4797,5 +4849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4813,5 +4865,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5044,5 +5096,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Subir" @@ -5276,6 +5328,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5290,6 +5342,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5355,17 +5407,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Cancelar resolución de conflicto" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Aplicar la resolución de conflictos" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5436,20 +5488,22 @@ msgstr "Conflictos en la etiquetas pegadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Pegar ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Desde ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "A ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5458,5 +5512,5 @@ msgstr[1] "{0} etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5468,5 +5522,5 @@ msgstr[1] "{0} vías" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5537,5 +5591,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Valor:" @@ -5661,5 +5715,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Detalles" @@ -6074,5 +6128,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición." @@ -6155,5 +6209,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6369,5 +6423,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Abrir" @@ -7226,5 +7280,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7698,4 +7752,9 @@ "max. 100 changesets." msgstr "" +"Por favor elija una de las siguientes búsquedas estándar. Si solamente desea descargar conjuntos de cambios creados por " +"usted, seleccione Descargar solamente mi conjunto de cambios.
Tenga en cuenta que JOSM descargará máximo 100 conjuntos de " +"cambios." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147 @@ -7708,4 +7767,6 @@ "user name in the preferences first." msgstr "" +"Descargar mi conjuntos de cambios abiertos
Desactivado. Por " +"favor primero indique su usuario OSM en preferencias." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157 @@ -7718,4 +7779,7 @@ "currently no map view active." msgstr "" +"Descargue conjuntos de cambios en la vista actual de mapa." +"
Desactivado. No hay una vista de mapa activa en este momento." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168 @@ -7729,4 +7793,6 @@ "default query." msgstr "" +"Advertencia: hay un valor inesperado para la preferencia \"{0}\", era \"{1}" +"\". De vuelta a la cadena de búsqueda predeterminada." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51 @@ -7837,5 +7903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7969,5 +8035,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8027,26 +8093,26 @@ msgstr "({0}/{1}): Descargando relación ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etiquetas y miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relaciones padre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relaciones hijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplicar función:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Inserte un papel y aplicalo a las relaciones de miembros seleccionadas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8055,14 +8121,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Eliminarlos, limpiar la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorarlos, dejar la relación como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8074,9 +8140,9 @@ "''{0}''

¿Desea realmente añadir otro miembro relacionado?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Miembros múltiples referenciando a la misma primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8089,5 +8155,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8096,5 +8162,5 @@ "del primer miembro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8103,5 +8169,5 @@ "del último miembro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8111,5 +8177,5 @@ "del primer miembro seleccionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8119,5 +8185,5 @@ "del último miembro seleccionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -8126,10 +8192,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8138,5 +8204,5 @@ "la selección actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8147,64 +8213,64 @@ "la selección actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Seleccionar primitivas para la relación de miembros señalada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Ordenar los miembros de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor de relaciones: Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Invertir el orden de los miembros de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor de relaciones: Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Mover los miembro(s) seleccionos hacia arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor de relaciones: Mover arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Mover los miembros seleccionados hacia abajo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor de relaciones: Mover abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Quitar los miembros seleccionados de esta relación" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor de relaciones: Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Eliminar esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8217,19 +8283,19 @@ "relación." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Sí, crear un conflicto y cerrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Haga click para crear un conflicto y cerrar este editor de relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8237,5 +8303,5 @@ "relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8247,5 +8313,5 @@ "el editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8256,50 +8322,50 @@ "necesario resolver el conflicto antes de continuar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplicar las actualizaciones actuales" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Aplicar las actualizaciones y cerrar el diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Añadir una etiqueta vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Descargar todos los miembros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor de Relaciones: Descargar Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Descargar los miembros incompletos seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Fijar una función para los miembros seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aplicar función" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8308,29 +8374,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Esto equivale a borrar los roles de esas primitivas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "¿Quiere aplicar el nuevo rol?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Sí, aplícalo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, no lo apliques" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirmar función vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" "Editar la relación del miembro de la relación seleccionada actualmente " "referida a" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8519,5 +8591,5 @@ #, java-format msgid "The string ''{0}'' is not a valid double value." -msgstr "" +msgstr "La cadena \"{0}\" no es un valor double válido." #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 @@ -8677,5 +8749,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -8805,4 +8877,5 @@ msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" +"Advertencia: ubicación incorrecta en el documento HTML. La excepción fue: {0}" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 @@ -8861,4 +8934,6 @@ "Failed to set reference. Reference version {0} not available in history." msgstr "" +"Fallo al establecer referencia. La revisión de la revisión {0} no está " +"disponible en el historial." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 @@ -8909,5 +8984,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 msgid "Open a history browser with the history of this node" -msgstr "" +msgstr "Abrir un navegador de históricos con el histórico de este nodo" #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 @@ -10159,12 +10234,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Descargar datos de OSM a lo largo de esta traza" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Descargar todo entre:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10172,8 +10251,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Área máxima por petición:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10197,4 +10278,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10649,10 +10731,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Borrar archivo de imagen del disco" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10661,5 +10743,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "El archivo de imagen no se pudo borrar." @@ -12902,5 +12984,5 @@ msgstr "Añadir una nueva etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12909,53 +12991,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Más información sobre esta característica" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Roles disponibles" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Atributos opcionales" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "vía sin salida" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconocido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12965,15 +13043,15 @@ msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Error analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Los elementos del tipo {0} son soportados" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12983,18 +13061,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -13009,4 +13087,28 @@ msgid "Preset group {0}" msgstr "Grupo predefinido {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Buscar: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Búsqueda de objetos" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Zoom a la selección" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Buscar: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13722,5 +13824,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13732,10 +13834,10 @@ msgstr "Archivos del servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13744,5 +13846,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14478,11 +14580,11 @@ msgstr "Descargando lista de componentes..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Descargando lista de componentes desde ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14491,10 +14593,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Escribiendo la lista de componentes a la caché local ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" @@ -14502,6 +14604,6 @@ "Analizando sintáctivamente la lista de componentes desde el sitio ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14510,5 +14612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14798,5 +14900,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15539,14 +15641,14 @@ msgstr "Edificios" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15578,5 +15680,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15633,5 +15735,5 @@ msgstr "CadastreGrabber: URL Ilegal." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15639,5 +15741,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15646,5 +15748,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Elegir desde..." @@ -15652,17 +15754,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Seleccionar comuna" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Catastro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Digitalización automática" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15671,13 +15773,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM está detenido para que el cambio surta efecto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15704,13 +15806,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Seleccione tabla de montaje" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15766,5 +15873,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15775,13 +15882,13 @@ msgstr "lámina de agua" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15829,5 +15936,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15835,26 +15942,26 @@ msgstr "dirección" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Activar caché automático" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Tamaño máximo de caché (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15872,9 +15979,9 @@ "creado mediante este componente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS del catastro francés" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15882,10 +15989,10 @@ "activo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Fuente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15895,5 +16002,5 @@ "preferencias de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15903,9 +16010,9 @@ "intermedios. Útil para los textos sobre fondos oscuros." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Permitir múltiples capas apiladas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -15913,5 +16020,5 @@ "transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" @@ -15919,111 +16026,116 @@ #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Graba las imágenes más pequeñas (mejor calidad pero mayor uso de memoria)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Fijar tamaño del cuadrado (por defecto 100 m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Tamaño fijado (desde 25 a 100 m)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Frontera administrativa municipal." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16031,5 +16143,5 @@ "tamaño" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16037,5 +16149,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16438,4 +16550,39 @@ msgid "TCX Files (*.tcx)" msgstr "Archivos TCX (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Descargar objeto..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Descargar elementos del mapa hasta el final de la vía seleccionada" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Descargar ahora" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Por favor, seleccione al menos una tarea para descargar" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1}: Comenzando {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Error en el análisis sintáctico {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16525,5 +16672,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "Utiliza scripts externos in JOSM" @@ -16606,5 +16753,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Actualizar" @@ -17164,13 +17311,14 @@ msgstr "Mediciones" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "Añadir giros prohibidos a la izquierda para el conjunto de 4 o 5 vías." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" @@ -17178,18 +17326,18 @@ "izquierda." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Por favor, seleccione 4 vías que conformen una relación cerrada" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Imposible ordenar las vías. Por favor, verifica sus direcciones" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Crear restricción de giro a la izquierda Michigan" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -17311,13 +17459,13 @@ msgstr "Cola" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "desconectado" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "conectado" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17802,5 +17950,5 @@ #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24 msgid "Revert changeset fully" -msgstr "" +msgstr "Conjunto de cambios revertido en su totalidad" #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25 @@ -17816,5 +17964,5 @@ #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28 msgid "Revert changeset" -msgstr "" +msgstr "Revertir conjunto de cambios" #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 @@ -17827,9 +17975,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17870,7 +18013,7 @@ #, java-format msgid "Revert changeset #{0}" -msgstr "" - -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +msgstr "Revertir conjunto de cambios #{0}" + +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17898,10 +18041,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18702,5 +18845,5 @@ "applicable for." msgstr "" -"Seleccione los tipos de vehículos a los que es restricción de giro " +"Seleccione los tipos de vehículos a los que la restricción de giro " "no es aplicable." @@ -18782,5 +18925,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:104 msgid "Only participating in selection" -msgstr "Únicamente los que formen parte de la selección" +msgstr "Únicamente las que formen parte de la selección" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:106 @@ -18891,5 +19034,5 @@ "creating/editing a turn restriction from the current JOSM selection." msgstr "" -"Por favor, configurar el acceso directo del teclado con los " +"Por favor, configure el acceso directo del teclado con los " "que lanzar la creación/edición de restricciones de los elementos " "seleccionados en JOSM." @@ -19023,5 +19166,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42 msgid "Please go to the Basic editor and manually choose an OSM way." -msgstr "" +msgstr "Por favor, seleccione manualmente una vía OSM en el Editor Básico." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48 @@ -19125,47 +19268,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19406,14 +19549,50 @@ msgstr "Cruce de vías" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Nodos duplicados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Esta examen comprueba que no haya nodos en el mismo lugar." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "¿Fusionar nodos duplicados?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Nodos duplicados" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Nodos duplicados" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "¿Fusionar nodos duplicados?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Nodos duplicados" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "¿Fusionar nodos duplicados?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Nodos en la misma posición" @@ -19575,59 +19754,59 @@ msgstr "Vías superpuestas" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "Corrector de relaciones:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20531,9 +20710,9 @@ msgstr "¿URL no válida?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Descargar las teselas visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20542,46 +20721,46 @@ "más, o cambie la resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Cambiar resolución" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Recargar teselas erróneas" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Guardar capa WMS como archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Salvar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Cargar capa WMS desde archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Cargar capa WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Error en el formato del archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Error al leer el archivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Fijar marcador WMS" @@ -20731,398 +20910,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "frontera" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Incremento:" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "alta tensión" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolígono" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Red" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "transporte público" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Restricción" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "ruta" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "sitio" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vía fluvial" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Actualizar" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -21191,11 +21265,17 @@ "openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Descargar datos de OSM a lo largo de esta traza" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Duplicado de vías con cierto desplazamiento unas de otras" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21206,5 +21286,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -21213,15 +21293,15 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Visualiza la información de enrutamiento como un grafo de red." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21235,10 +21315,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Ayuda a vectorizar imágenes WMS" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21248,5 +21328,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21259,15 +21339,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "No añade ningún giro a la izquierda para conjuntos de 4 o 5 vías" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Convierte de manera sencilla un área a un multipolígono." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21278,5 +21358,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21290,10 +21370,10 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Muestra una imágen OpenLayers de fondo" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -21302,5 +21382,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21310,5 +21390,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21318,5 +21398,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21328,5 +21408,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -21337,10 +21417,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "El gran JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21350,15 +21430,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Dejar que otras aplicaciones envíen comandos a JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Componente para revertir conjuntos de cambios" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21366,7 +21446,11 @@ "properties window. Available country presets: Germany." msgstr "" +"Componente para el etiquetado de objetos en función de una selección de " +"señales de tráfico. El dialogo se puede abrir haciendo clic en el pequeño " +"icono de la esquina superior derecha de la ventana de propiedades. País " +"disponible de los predefinidos: Alemania." #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21378,10 +21462,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamiento." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21393,5 +21477,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21402,10 +21486,10 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -21414,5 +21498,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21426,10 +21510,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Crea edificios entremedianeras a partir de bloques únicos" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21440,5 +21524,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21449,19 +21533,19 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " "restrictions in the OpenStreetMap database." msgstr "" -"El complementode turnrestrictions facilita la introducción de información " +"El complemento turnrestrictions facilita la introducción de información " "sobre restricciones de giro a la base de datos OpenStreetMap." #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" -msgstr "" +msgstr "Premite desborrar un objeto de la base de datos OSM" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21473,5 +21557,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21481,5 +21565,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21490,5 +21574,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -21496,10 +21580,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" -msgstr "" +msgstr "Selecciona una secuencia de vías conectadas no ramificadas" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21510,5 +21594,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -28106,8 +28190,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "alta tensión" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "baja tensión" @@ -33483,4 +33571,177 @@ msgstr "playa" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "ruta" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "frontera" + #. color deprecated #. @@ -33999,4 +34260,7 @@ msgstr "Sicilia - Italia" +#~ msgid "closedway" +#~ msgstr "vía sin salida" + #~ msgid "Move" #~ msgstr "Mover" @@ -34133,7 +34397,4 @@ #~ msgid "current delta: {0}s" #~ msgstr "delta actual: {0}s" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Por favor, seleccione al menos una tarea para descargar" #~ msgid "Error while loading page {0}" @@ -35012,7 +35273,4 @@ #~ "interesantes." -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Seleccione tabla de montaje" - #~ msgid "Cannot read numeric value from response" #~ msgstr "No se puede leer el valor numérico de la respuesta" Index: applications/editors/josm/i18n/po/et.po =================================================================== --- applications/editors/josm/i18n/po/et.po (revision 22464) +++ applications/editors/josm/i18n/po/et.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 16:47+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 20:05+0000\n" "Last-Translator: Dirk Stöcker \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: 2010-07-11 18:50+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Abi" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -105,5 +105,5 @@ "URL" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -123,6 +123,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -232,8 +232,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -243,13 +243,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -265,5 +266,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -272,5 +273,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -287,13 +289,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Katkesta" @@ -352,11 +354,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -403,6 +405,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -430,5 +433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -552,5 +555,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -612,6 +615,6 @@ msgstr "Palun vali vähemalt kaks teed, mida sobitada." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -620,9 +623,9 @@ msgstr "Kopeeri" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopeeri valitud objektid puhvrisse." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Palun vali kopeerimiseks mõni objekt." @@ -657,6 +660,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -725,5 +728,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Eralda kiht." @@ -743,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objekti tüüp:" @@ -752,5 +755,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objekti ID:" @@ -795,5 +798,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Kahekordista" @@ -941,25 +944,25 @@ msgstr "Lõikumist ei leitud. Mitte midagi ei muudetud." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Sõlm lisatud kõikidesse lõikumiskohtadesse." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Kustutada teed, mis pole sisemise multihulknurga osad" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Paranda relatsioonid" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Ühendatud iseenesega kattuv ala" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Kattuvate alade ühendamine" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -969,33 +972,33 @@ "tekitatud vigu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Sisesta kõigi vastuolude kohta väärtused." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Lahenda vastuolud." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Paranda sildikonfliktid" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Element relatsioonidest eemaldatud" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Alade ühendamine: Eemalda lühikesed teed" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Suletud tee" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Eemalda sildid sisemistelt teedelt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Alade ühendamise funktsioon" @@ -1014,5 +1017,5 @@ msgstr "Ühenda sõlm ja joon." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Ei ole shortcuti." @@ -1360,6 +1363,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1370,17 +1373,17 @@ msgstr "Kleebi" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Kleebi puhvri sisu." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1389,14 +1392,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Kleebi sildid." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Lisa kõikidele valitud objektidele puhvris olevad sildid." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1405,5 +1408,5 @@ msgstr[1] "Kleebin {0} silti" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1472,5 +1475,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1481,12 +1484,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1513,6 +1516,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Viga" @@ -1540,5 +1543,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Salvesta" @@ -1958,4 +1961,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Andmete allalaadimine" @@ -2420,4 +2424,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2720,5 +2725,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "" @@ -2913,5 +2918,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2932,9 +2937,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3035,5 +3040,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3126,5 +3131,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3135,5 +3140,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3317,10 +3322,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Viga lehekülje {0} laadimisel." + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" msgstr "" @@ -3523,5 +3559,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3529,5 +3565,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3567,5 +3603,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3606,6 +3642,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3617,5 +3652,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3627,7 +3661,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3845,7 +3878,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3853,29 +3886,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 -msgid "highway" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +msgid "highway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 -msgid "waterway" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +msgid "waterway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "" @@ -3883,7 +3916,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3895,5 +3928,5 @@ msgstr[1] "{0} punkti" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3952,6 +3985,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3959,6 +3992,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3967,5 +4000,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4040,5 +4073,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4139,69 +4172,69 @@ msgstr "Salasõna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 +msgid "options" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 -msgid "options" +msgid "Show this help" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 -msgid "Show this help" +msgid "Standard unix geometry argument" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" +msgid "Download the bounding box" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 -msgid "Download the bounding box" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 -msgid "Select with the given search" +msgid "Launch in maximized mode" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" +msgid "Reset the preferences to default" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 -msgid "Reset the preferences to default" +msgid "Set the language" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4211,9 +4244,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4221,46 +4254,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Varaste lIsandprogrammidl laadimine" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Loon kasutajaliidest" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "LIsandprogrammide laadimine" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Lahenda" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Fail" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4279,10 +4328,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4290,10 +4339,11 @@ msgstr "Tööriistad" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Eelseaded" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4304,5 +4354,5 @@ msgstr "Menüü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Heli" @@ -4569,5 +4619,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4585,5 +4635,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4788,5 +4838,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "" @@ -5003,6 +5053,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5017,6 +5067,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5077,17 +5127,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5158,20 +5208,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5180,5 +5232,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5190,5 +5242,5 @@ msgstr[1] "{0} teed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5254,5 +5306,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5356,5 +5408,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5757,5 +5809,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5838,5 +5890,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6039,5 +6091,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6890,5 +6942,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7458,5 +7510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7587,5 +7639,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7642,26 +7694,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7670,14 +7722,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7687,9 +7739,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7699,15 +7751,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7715,5 +7767,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7721,20 +7773,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7743,64 +7795,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Liiguta hetkel valitud liiget ülespoole" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Liiguta hetkel valitud liiget allapoole" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7809,23 +7861,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7834,5 +7886,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7841,50 +7893,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Rakenda jooksvad uuendused" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7893,26 +7945,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8246,5 +8304,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9673,12 +9731,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9686,8 +9748,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9711,4 +9775,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10140,10 +10205,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10152,5 +10217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12317,5 +12382,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12324,53 +12389,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Rohkem teavet sellest funktsioonist" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Valikulised tunnused:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "suletud tee" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Tundmatu tüüp: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12380,15 +12441,15 @@ msgstr "Ei saa lugeda sildistamise eelseadeid: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Viga sõelumisel {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elemente tüübist {0} toetatakse." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12398,18 +12459,18 @@ msgstr[1] "Muuda {0} objekti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Midagi pole valitud!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Muuda seadeid" @@ -12424,4 +12485,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Otsi" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Otsi objekte." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Suurenda valikule" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Otsi objekte." #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13123,5 +13208,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13133,10 +13218,10 @@ msgstr "OSM serveri failid" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13145,5 +13230,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13862,11 +13947,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13875,16 +13960,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13893,5 +13978,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14152,5 +14237,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14870,14 +14955,14 @@ msgstr "Ehitised" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14909,5 +14994,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -14964,5 +15049,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -14970,5 +15055,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -14977,5 +15062,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -14983,17 +15068,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15002,13 +15087,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15033,13 +15118,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15095,5 +15184,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15104,13 +15193,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15158,5 +15247,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15164,26 +15253,26 @@ msgstr "aadress" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15195,18 +15284,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15214,5 +15303,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15220,127 +15309,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15348,5 +15442,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15736,4 +15830,39 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68 msgid "TCX Files (*.tcx)" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Lae objekt alla..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Lae kaardi andmed OSM serverist" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Allalaetav ala" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Palun vali allalaadimiseks vähemalt üks toiming." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, java-format +msgid " adding {0} {1}" msgstr "" @@ -15824,5 +15953,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15905,5 +16034,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "" @@ -16446,30 +16575,31 @@ msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16581,13 +16711,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17089,9 +17219,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17134,5 +17259,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17160,10 +17285,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18343,47 +18468,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18616,14 +18741,45 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +msgid "Mixed type duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +msgid "Highway duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Raudtee" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +msgid "Waterway duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +msgid "Boundary duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +msgid "Power duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18776,59 +18932,59 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19685,55 +19841,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19874,398 +20030,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "piir" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "edasisuunaline osa" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "joon" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Hulknurk" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Võrk" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "ühistranspordi_plaanid" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Keelud" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "teekond" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Kleebi" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "aeronautika" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Uuenda" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20322,11 +20373,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Laen alla OSM andmeid..." + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20335,20 +20392,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20358,10 +20415,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Aitab WMS kujutisi vektoriseerida" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20369,5 +20426,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20377,15 +20434,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20394,5 +20451,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20402,15 +20459,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20418,5 +20475,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20424,5 +20481,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20431,5 +20488,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20438,10 +20495,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20449,15 +20506,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20467,5 +20524,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20474,10 +20531,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20486,5 +20543,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20493,15 +20550,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20511,10 +20568,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20523,5 +20580,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20530,5 +20587,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20537,10 +20594,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20549,5 +20606,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20557,5 +20614,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20564,15 +20621,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20581,5 +20638,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27174,8 +27231,11 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "joon" #: build/trans_presets.java:2452 +msgctxt "Power Line" msgid "minor_line" msgstr "" @@ -32539,4 +32599,177 @@ msgstr "rand" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "teekond" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "piir" + #. color deprecated #. @@ -33058,4 +33291,7 @@ #~ msgstr "Lae OSMi serverisse" +#~ msgid "closedway" +#~ msgstr "suletud tee" + #~ msgid "Move" #~ msgstr "Liiguta" @@ -33173,7 +33409,4 @@ #~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada" -#~ msgid "Download Area" -#~ msgstr "Allalaetav ala" - #~ msgid "Use preset ''{0}'' of group ''{1}''" #~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''" @@ -33241,12 +33474,6 @@ #~ msgstr "Kõik teed olid tühjad." -#~ msgid "Please select at least one task to download" -#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming." - #~ msgid "Can only edit help pages from JOSM Online Help" #~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada." - -#~ msgid "Error while loading page {0}" -#~ msgstr "Viga lehekülje {0} laadimisel." #~ msgid "Open in Browser" Index: applications/editors/josm/i18n/po/eu.po =================================================================== --- applications/editors/josm/i18n/po/eu.po (revision 22464) +++ applications/editors/josm/i18n/po/eu.po (revision 22465) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" "PO-Revision-Date: 2010-07-06 17:47+0000\n" "Last-Translator: Mikel Lizarralde \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:51+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Laguntza" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -105,5 +105,5 @@ "izenak onartzen ezta artxiboen URLak ere" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -123,6 +123,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -238,8 +238,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -249,13 +249,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -271,5 +272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -278,5 +279,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -293,13 +295,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Utzi" @@ -360,11 +362,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -411,6 +413,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -438,5 +441,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -560,5 +563,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -621,6 +624,6 @@ msgstr "Aukeratu bateratzeko bi bide gutxienez." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -629,9 +632,9 @@ msgstr "Kopiatu" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopiatu hautatutako objektuak itsasteko buferrean." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Aukeratu ezazu kopiatzeko zerbait" @@ -666,6 +669,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -735,5 +738,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Geruza banatu" @@ -753,5 +756,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objektu mota" @@ -762,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objektuaren ID-a" @@ -807,5 +810,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Bikoiztu" @@ -955,25 +958,25 @@ msgstr "Ez da ebakidurarik aurkitu. Ez da ezer aldatu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Ebakidura guztietan nodoa gehituta" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Barne-multipoligono baten parte ez diren bideak ezabatu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Erlazioak konpondu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Auto-teilakatze azalera gainjarri da" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Elkarren gainean dauden azalerak batu egin dira" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -983,33 +986,33 @@ "ezazu ez direla erroreak gehitu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Gatazka guztientzako balioak sartu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Gatazkak konpondu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Etiketa gatazkak konpondu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Erlazioetatik elementua ezabatua izan da" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Gehitu azalerak: ezabatu bide zidorrak" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Itxitako bidea" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Barne bideetatik etiketak kendu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Azalera_gehitu funtzioa" @@ -1028,5 +1031,5 @@ msgstr "Nodoa eta marra zuzena gehitu" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Lasterbiderik gabe" @@ -1400,6 +1403,6 @@ "bakarrik." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1410,9 +1413,9 @@ msgstr "Itsatsi" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Arbeleko edukiak itsatsi." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" @@ -1420,9 +1423,9 @@ "dauzkatenak?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Erantsi osatu gabeko bazkiderik gabe" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1434,14 +1437,14 @@ "jatorrizko osatugabe horiek gabe?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Etiketak itsatsi" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Aukeraturiko elementu guztiei, arbeleko edukiaren etiketak aplikatu." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1450,5 +1453,5 @@ msgstr[1] "{0} etiketa itsasten" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1519,5 +1522,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1528,12 +1531,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1560,6 +1563,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Errorea" @@ -1587,5 +1590,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Gorde" @@ -2014,4 +2017,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Datuak deskargatu" @@ -2506,4 +2510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2845,5 +2850,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Iragazkia" @@ -3058,5 +3063,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3077,9 +3082,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "Ados" @@ -3183,5 +3188,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Gatazka bikoitza" @@ -3277,5 +3282,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3289,5 +3294,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Konfirmazioa ezabatu" @@ -3477,11 +3482,42 @@ msgstr "Propietateak " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Honi dagokion erlazioaren rolak" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Etiketen konponketa automatikoa" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3710,5 +3746,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3717,5 +3753,5 @@ "Ezin izan da jatorrizko {0}-a gehitu datu-multzora beronen barne delako jada" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3758,5 +3794,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3803,6 +3839,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3814,5 +3849,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3824,7 +3858,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4049,7 +4082,7 @@ msgstr "Ez erakutsi berriz (aukera gogoratzen du)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4057,29 +4090,29 @@ msgstr " [id-a: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "osatu gabea" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "errepidea" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "trenbidea" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "ubidea" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "lurzorua" @@ -4087,7 +4120,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4099,5 +4132,5 @@ msgstr[1] "{0} nodo" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "garraio publikoa" @@ -4156,6 +4189,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4163,6 +4196,6 @@ msgstr "eraikina" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4171,5 +4204,5 @@ msgstr[1] "{0} kide" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4244,5 +4277,5 @@ msgstr "Objektua ezabatu da" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4344,29 +4377,29 @@ msgstr "Pasahitza" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "erabilera" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "aukerak" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Erakutsi laguntza hau" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Unixeko geometria argumento estandarra" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Deskargatu inguru-koadroa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Deskargatu URL-ean zehaztutako tokia (lat=x&lon=y&zoom=z erabiliz)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" @@ -4374,9 +4407,9 @@ "Ireki aukerarekin)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Deskargatu inguru-koadroa gps datu gordin moduan" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" @@ -4384,33 +4417,33 @@ "gordin moduan" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Aukeratu emandako bilaketarekin" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Abiarazi modu maximizatuan" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Preferentziak jatorrizkora berrezarri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Hizkuntza ezarri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "aukera hauek Java-ren sistema propietate moduan ematen dira" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/JOSM/KARPETARA/BIDEA/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Erabiltzailearen hobespen guztientzat karpeta aldatu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4424,9 +4457,9 @@ "megabytetan" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "adibideak" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4436,47 +4469,63 @@ "prozesatzen dira." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" "--selection erabiltzen baduzu, ziurtatu zenbait datu kargatzen dituzula." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Hasieratzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Pluginak eguneratzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Eguneratutako pluginak instalatzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Hasierako pluginak kargatzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Hobespen orijinalak ezartzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "GUI nagusia sortzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Pluginak kargatzen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Konpondu" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "{0} hobespena ezabatu dugu ez bait da jadanik erabiltzen." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Fitxategia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4495,10 +4544,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Ikusi" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4506,10 +4555,11 @@ msgstr "Tresnak" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Aurrezarpenak" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4520,5 +4570,5 @@ msgstr "Menua: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audioa" @@ -4799,5 +4849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4815,5 +4865,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5036,5 +5086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Gora" @@ -5258,6 +5308,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5272,6 +5322,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5332,17 +5382,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Gatazka-konponketa desegin" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Kopondutako gatazkak ezarri" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5413,20 +5463,22 @@ msgstr "Gatazkak itsatsitako etiketetan" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Itsatsi..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Nondik..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "Nora..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5435,5 +5487,5 @@ msgstr[1] "{0} etiketa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5445,5 +5497,5 @@ msgstr[1] "{0} bide" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5509,5 +5561,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Balioa:" @@ -5611,5 +5663,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Xehetasunak" @@ -6013,5 +6065,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Erlazio honen kopia bat sortu eta beste edizio-leiho batean ireki" @@ -6094,5 +6146,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6295,5 +6347,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Ireki" @@ -7146,5 +7198,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7714,5 +7766,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7843,5 +7895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7898,26 +7950,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etiketak eta partaideak" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Guraso-erlazioak" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7926,14 +7978,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7943,9 +7995,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7955,15 +8007,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7971,5 +8023,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7977,20 +8029,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7999,64 +8051,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Ordenatu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Alderantzikatu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8065,23 +8117,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8090,5 +8142,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8097,50 +8149,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8149,26 +8201,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8501,5 +8559,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9928,12 +9986,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9941,8 +10003,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9966,4 +10030,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10395,10 +10460,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10407,5 +10472,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12570,5 +12635,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12577,53 +12642,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12633,15 +12694,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12651,18 +12712,18 @@ msgstr[1] "Aldatu {0} objektuak" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Aldatu propietateak" @@ -12677,4 +12738,27 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Bilatu" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Objektuak bilatu." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +msgid "Show only applicable to selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Objektuak bilatu." #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13374,5 +13458,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13384,10 +13468,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13396,5 +13480,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14113,11 +14197,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14126,16 +14210,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14144,5 +14228,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14403,5 +14487,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15114,14 +15198,14 @@ msgstr "Eraikinak" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15153,5 +15237,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15208,5 +15292,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15214,5 +15298,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15221,5 +15305,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -15227,17 +15311,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15246,13 +15330,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15277,13 +15361,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15339,5 +15427,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15348,13 +15436,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15402,5 +15490,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15408,26 +15496,26 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15439,18 +15527,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15458,5 +15546,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15464,127 +15552,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15592,5 +15685,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15980,4 +16073,39 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68 msgid "TCX Files (*.tcx)" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Deskargatu objektua..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Jaitsi aukeratutako bidearen bukaerako mapa-datuak" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Orain jaitsi" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Aukeratu bateratzeko bi nodo gutxienez." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, java-format +msgid " adding {0} {1}" msgstr "" @@ -16068,5 +16196,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16149,5 +16277,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "" @@ -16690,30 +16818,31 @@ msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16825,13 +16954,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17333,9 +17462,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17378,5 +17502,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17404,10 +17528,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18587,47 +18711,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18860,14 +18984,50 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Bateratu bikoiztutako nodoak?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Bateratu bikoiztutako nodoak?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Bateratu bikoiztutako nodoak?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Bateratu bikoiztutako nodoak?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Bateratu bikoiztutako nodoak?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Bateratu bikoiztutako nodoak?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -19020,59 +19180,59 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "Gehigarri honek erlazioetako arazoak egiaztatzen ditu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19959,9 +20119,9 @@ msgstr "URL desegokia?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Jaitsi ikusgai dauden \"tile\"ak" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -19970,33 +20130,33 @@ "bereizmena" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Bereizmena aldatu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "\"Tile\" okerrak berriz kargatu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alpha kanala" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Gorde WMS geruza fitxategian" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Gorde WMS geruza" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Kargatu WMS geruza fitxategitik" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Kargatu WMS geruza" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -20004,13 +20164,13 @@ "Sustengurik gabeko WMS fitxategi-bertsioa; {0} aurkitu da eta {1} espero zen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Fitxategiaren formatuan errorea" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Fitxategia kargatzean errorea" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "WMS laster-marka ezarri" @@ -20156,231 +20316,126 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "muga" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "hurrengo segmentua" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Linea" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "multipoligonoa" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Sarea" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "garraio publikoa" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Debekua" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "ibilbidea" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "gunea" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "ubidea" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "Fitxategi guztiak" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "Ezaugarriak" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "Fitxategi-aukeraketa koadroa bertan behera utzi." #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "Karpeta berria sortu" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "Fitxategia ezabatu" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "Fitxategi izena sartu:" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "Sartu bidea edota karpeta izena:" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "Errorea " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -20388,90 +20443,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "Fitxategiaren izena:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "Fitxategi-izena:" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "FileChooser laguntza." #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "Fitxategiak" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "Mota honetako fitxategiak:" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "Mota Honetako Fitxategiak:" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "Iragazi" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "Karpetak" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "Hasiera" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "Zerrenda" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "Begiratu hemen:" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "Begiratu hemen:" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "Aldatua" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "Karpeta berria" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "Ireki aukeratutako fitxategia." #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "Fitxategiari izena aldatu" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -20479,75 +20534,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "Gorde hemen:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "Gorde hemen:" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "Gorde aukeratutako fitxategia." #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "Aukeraketa" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "Neurria" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "Maila bat igo" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "Eguneratu" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "Direktorio zerrenda eguneratu." #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "Urdina:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "Kolore izena:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "Berdea" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "Tonua:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "GTK kolore hautatzailea" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "Gorria" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "Saturazioa" @@ -20607,11 +20662,17 @@ "geruzatik openstreetmap.org-ra." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Datuak deskargatu" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Batak bestearekiko lerrokatu gabe dauden bikoiztutako bideak" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20622,5 +20683,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -20628,15 +20689,15 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Bideratze-informazioa bideratze-grafo moduan erakusten du." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Mapa-sareta bat hondoko-geruza moduan eskuratzeko aukera" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20649,10 +20710,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "WMS irudiak bektorizatzeko laguntza." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20660,5 +20721,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20668,15 +20729,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Ezkerrera biratzeko debekua gehitzen die 4 edo 5 bide-multzoei" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Azalera bat multipoligono batean bilakatzen du era errazean." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20687,5 +20748,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20695,15 +20756,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "OpenLayers-eko irudi bat erakusten du hondoan" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "OpenStreetBugs-etik akatsak jaisten ditu" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20713,5 +20774,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20721,5 +20782,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20730,5 +20791,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20739,10 +20800,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "JGoodies Plastic handiaren \"Look and Feel\"-a." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20751,15 +20812,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Utzi beste aplikazioei JOSMra komandoak bidaltzen." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Aldaketa-multzoak" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20769,5 +20830,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20779,10 +20840,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Bideratzaile-gaitasunak ematen ditu" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20794,5 +20855,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20803,10 +20864,10 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Egungo GPS kokapenean markak/nodoak gehitzeko aukera ematen digu." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -20815,5 +20876,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20827,10 +20888,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20841,5 +20902,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20850,5 +20911,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20859,5 +20920,5 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" @@ -20866,5 +20927,5 @@ #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20876,5 +20937,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20887,5 +20948,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20897,15 +20958,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Elkar-konektaturiko bide luzeen deskarga erraza" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Aukeratu adarkadura ez dute konektaturiko bideak" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20916,5 +20977,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27511,8 +27572,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "Linea" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "behe-tentsioa" @@ -32876,4 +32941,177 @@ msgstr "hondartza" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "ibilbidea" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "muga" + #. color deprecated #. Index: applications/editors/josm/i18n/po/fi.po =================================================================== --- applications/editors/josm/i18n/po/fi.po (revision 22464) +++ applications/editors/josm/i18n/po/fi.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 16:24+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-21 15:47+0000\n" "Last-Translator: Mika Laari \n" "Language-Team: Finnish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:49+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Ohje" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Parametrin ”downloadgps” arvoksi ei kelpaa tiedoston URL eikä nimi." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -234,8 +234,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -245,13 +245,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -267,5 +268,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -274,5 +275,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -289,13 +291,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Peruuta" @@ -356,11 +358,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -407,6 +409,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -434,5 +437,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -556,5 +559,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -616,6 +619,6 @@ msgstr "Valitse ainakin kaksi yhdistettävää polkua." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -624,9 +627,9 @@ msgstr "Kopioi" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopioi valitut objektit leikepöydälle." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Valitse jotain kopioitavaksi." @@ -661,6 +664,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -729,5 +732,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Uusi taso" @@ -747,5 +750,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objektin tyyppi:" @@ -756,5 +759,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objektin tunniste:" @@ -799,5 +802,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Monista" @@ -945,25 +948,25 @@ msgstr "Leikkauspisteitä ei löytynyt, joten mitään ei muutettu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Lisää piste kaikkiin leikkauskohtiin" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Poista polut, jotka eivät ole monimonikulmion sisämonikulmioita" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Korjaa relaatiot" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Yhdistettiin itsensä kanssa päällekkäinen alue" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Yhdistettiin osittain päällekkäiset alueet" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -973,33 +976,33 @@ "syntynyt virheitä." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Syötä arvot kaikille ristiriidoille." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Ratkaise ristiriidat" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Korjaa tagikonflikteja" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Kohde poistettiin relaatioista" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Alueiden yhdistus: Lyhyiden polkujen poisto" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Suljettu polku" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Poista tagit inner-poluilta" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Yhdistä alueet -tominto" @@ -1018,5 +1021,5 @@ msgstr "Yhdistä piste ja polku." -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Ei pikanäppäintä" @@ -1385,6 +1388,6 @@ "lähellä 90 tai 180 astetta." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1395,17 +1398,17 @@ msgstr "Liitä" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Liitä leikepöydän sisältö" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Poista keskeneräiset jäsenet?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Liitä ilman keskeneräisiä jäseniä?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1416,14 +1419,14 @@ "objektit poistetaan. Liitetäänkö data ilman keskeneräisiä objekteja?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Liitä tagit" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Liitä valituille kohteille tagit leikepöydältä." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1432,5 +1435,5 @@ msgstr[1] "Liitetään {0} tagia" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1499,5 +1502,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1508,12 +1511,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1540,6 +1543,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Virhe" @@ -1567,5 +1570,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Tallenna" @@ -1990,4 +1993,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Lataa dataa" @@ -2474,4 +2478,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2809,5 +2814,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Suodin" @@ -2833,8 +2838,11 @@ " {0}" msgstr "" +"Hakulausekkeessa on virhe: \n" +"\n" +" {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 msgid "Invalid search expression" -msgstr "" +msgstr "Virhe hakulausekkeessa" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -3015,5 +3023,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3034,9 +3042,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3139,5 +3147,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Kaksinkertainen ristiriita" @@ -3233,5 +3241,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3245,5 +3253,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Poiston vahvistus" @@ -3433,11 +3441,42 @@ msgstr "Ominaisuudet: " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Roolit relaatioissa, jotka viittavat" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automaattinen tagien korjaus" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Virhe luotaessa välimuistihakemistoa: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3664,5 +3703,5 @@ msgstr "I" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3670,5 +3709,5 @@ msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3712,5 +3751,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3756,6 +3795,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3767,5 +3805,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3777,7 +3814,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4000,7 +4036,7 @@ msgstr "Älä näytä uudestaan (muistaa valinnan)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4008,29 +4044,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "keskeneräinen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "tie" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "rata" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vesiväylä" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "maankäyttö" @@ -4038,7 +4074,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4050,5 +4086,5 @@ msgstr[1] "{0} pistettä" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "julkinen liikenne" @@ -4107,6 +4143,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4114,6 +4150,6 @@ msgstr "rakennus" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4122,5 +4158,5 @@ msgstr[1] "{0} jäsentä" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4195,5 +4231,5 @@ msgstr "Objekti poistettu" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4265,4 +4301,6 @@ "lat=y&lon=x&zoom=z or a filename" msgstr "" +"Lataa raaka-GPS:nä. Kukin parametri voi olla x1,y1,x2,y2 tai URL muotoa " +"lat=y&lon=x&zoom=z tai tiedostonimi" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61 @@ -4271,4 +4309,6 @@ "URL which returns osm-xml" msgstr "" +"Lisää alkuperäiseen valintaan. Kukin parametri voi olla Google-tyyppinen " +"hakulauseke tai osm-xml:ää palauttava URL" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62 @@ -4290,69 +4330,69 @@ msgstr "Salasana" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "käyttö" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "valinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Näytä tämä ohje" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +msgid "Standard unix geometry argument" +msgstr "UNIX-standardin mukainen geometria" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" -msgstr "" +msgid "Download the bounding box" +msgstr "Lataa rajattu alue" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 -msgid "Download the bounding box" -msgstr "" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z)" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" -msgstr "" +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "Avaa tiedosto (mitä tahansa Tiedosto/Avaa-valikon tuntemaa tyyppiä)" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" +msgid "Download the bounding box as raw gps" +msgstr "Lataa rajattu alue raaka-GPS:nä" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" -msgstr "" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z) raaka-GPS:nä" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" +msgid "Select with the given search" +msgstr "Valitse haun tulokset" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 -msgid "Select with the given search" -msgstr "" +msgid "Launch in maximized mode" +msgstr "Käynnistä suurennettuna" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Reset the preferences to default" msgstr "Palauta oletusasetukset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Aseta kieli" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +msgid "options provided as Java system properties" +msgstr "Javan järjestelmäominaisuuksina näkyvät asetukset" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/polku/josmin/hakemistoon/ " +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" +msgstr "Vaihda kaikkien käyttäjäasetuksien kansio" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4361,10 +4401,13 @@ "megabytes" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +"Huomio: JOSM tarvitsee paljon muistia joihinkin tehtäviin. Voi olla tarpeen " +"lisätä seuraava\n" +"Java-asetus, joka määrää suurimman käytettävän muistimäärän megatavuina." + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "esimerkkejä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4374,46 +4417,62 @@ "järjestyksessä." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +msgstr "Muista ladata dataa, jos käytät --selection-valitsinta" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Alustetaan" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Päivitetään liitännäisiä..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Asennetaan päivitetyt liitännäiset" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Ladataan aikaisia liitännäisiä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Asetetaan oletuksia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Luodaan pääikkuna" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Ladataan liitännäisiä" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Selvitä" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Asetus {0} on poistettu koska sitä ei enää tarvita." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Tiedosto" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4432,10 +4491,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Näytä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4443,10 +4502,11 @@ msgstr "Työkalut" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Esivalinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4457,5 +4517,5 @@ msgstr "Valikko: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Ääni" @@ -4532,4 +4592,6 @@ "this list with the mouse.
" msgstr "" +"Käy listaa läpi keskinapilla.
Voit valita suoraan listasta pitämällä CTRL-" +"nappia pohjassa.
" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296 @@ -4571,5 +4633,5 @@ #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 msgid "unset: do not set this property on the selected objects" -msgstr "" +msgstr "pois päältä: älä aseta tätä ominaisuutta valituille kohteille" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 @@ -4613,5 +4675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" -msgstr "" +msgstr "Poistettava" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 @@ -4622,5 +4684,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." -msgstr "" +msgstr "Paikka" #. the role column @@ -4641,5 +4703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" -msgstr "" +msgstr "Tästä voit sulkea ikkunan ja keskeyttää kohteiden poistamisen" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230 @@ -4648,16 +4710,18 @@ "level." msgstr "" +"Valitse peräkkäisiä OSM-ruutuja tietyltä " +"suurennostasolta." #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237 msgid "Zoom level:" -msgstr "" +msgstr "Suurennostaso:" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259 msgid "from tile" -msgstr "" +msgstr "ruudusta" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262 msgid "up to tile" -msgstr "" +msgstr "ruutuun" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439 @@ -4668,28 +4732,32 @@ "html>" msgstr "" +"Voit vaihtoehtoisesti antaa yksittäisen ruudun osoitteen muodossa suurennostaso/x/y, esim. 15/256/223. " +"Ruutuosoite voi olla myös muotoa suurennos,x,y tai suurennos;x;y." #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453 msgid "Tile address:" -msgstr "" +msgstr "Ruutuosoite:" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502 msgid "Apply the tile address" -msgstr "" +msgstr "Toteuta ruutuosoite" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561 msgid "Please enter a tile address" -msgstr "" +msgstr "Syötä ruutuosoite" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563 msgid "The current value isn''t a valid tile address" -msgstr "" +msgstr "Annettu ruutuosoite on väärää muotoa" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609 msgid "Please enter a tile index" -msgstr "" +msgstr "Syötä ruutuindeksi" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611 msgid "The current value isn''t a valid tile index for the given zoom level" -msgstr "" +msgstr "Kyseinen arvo ei ole minkään ruudun indeksi annetulla suurennostasolla" #. * @@ -4698,5 +4766,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17 msgid "My with Their" -msgstr "" +msgstr "Omaa ja muiden" #. * @@ -4705,5 +4773,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22 msgid "My with Merged" -msgstr "" +msgstr "Omaa ja yhdistettä" #. * @@ -4712,10 +4780,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27 msgid "Their with Merged" -msgstr "" +msgstr "Muiden ja yhdistettä" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82 #, java-format msgid "Role {0} is not participating in compare pair {1}." -msgstr "" +msgstr "Rooli {0} ei ole mukana vertailuparissa {1}." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 @@ -4723,10 +4791,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" -msgstr "" +msgstr "Ominaisuudet" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4744,5 +4812,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4751,5 +4819,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" -msgstr "" +msgstr "Ei ratkaisemattomia ristiriitoja tageissa" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 @@ -4764,10 +4832,10 @@ msgid "{0} pending tag conflict to be resolved" msgid_plural "{0} pending tag conflicts to be resolved" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} tagiristiriita ratkaistavana" +msgstr[1] "{0} tagiristiriitaa ratkaistavana" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" -msgstr "" +msgstr "Solmut (ratkaistu)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 @@ -4775,4 +4843,6 @@ "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +"Solmulistojen yhdiste jäädytetty. Tämän tien solmulistassa ei ole " +"ratkaisemattomia ristiriitoja" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 @@ -4782,9 +4852,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" -msgstr "" +msgstr "Tämän tien solmulistan ratkaisemattomat ristiriidat" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" -msgstr "" +msgstr "Jäsenet (ratkaistu)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 @@ -4806,5 +4876,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" -msgstr "" +msgstr "Ei ratkaisemattomia ristiriitoja ominaisuuksissa" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 @@ -4814,5 +4884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" -msgstr "" +msgstr "Ominaisuuksien ratkaisemattomat ristiriidat" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 @@ -4823,5 +4893,5 @@ #, java-format msgid "{0} more..." -msgstr "" +msgstr "Vielä {0}..." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 @@ -4841,5 +4911,5 @@ #, java-format msgid "List in role {0} is currently not participating in a compare pair." -msgstr "" +msgstr "Roolin {0} lista ei ole mukana missään vertailuparissa" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:801 @@ -4851,5 +4921,5 @@ #, java-format msgid "Item {0} not found in list." -msgstr "" +msgstr "Kohtaa {0} ei ole listassa" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237 @@ -4869,4 +4939,5 @@ msgid "List of elements in my dataset, i.e. the local dataset" msgstr "" +"Lista omassa datajoukossa olevista kohteista, eli paikallinen datajoukko" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 @@ -4881,4 +4952,6 @@ "decisions are applied." msgstr "" +"Lista yhdistelmäkohteista, jotka tulevat korvaamaan omat kohteet, kun " +"yhdistelyn tulokset toteutetaan." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 @@ -4890,20 +4963,21 @@ msgid "List of elements in their dataset, i.e. the server dataset" msgstr "" +"Lista muiden datajoukossa olevista kohteista, eli palvelimen datajoukko" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425 msgid "> top" -msgstr "" +msgstr "ylös" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427 msgid "Copy my selected nodes to the start of the merged node list" -msgstr "" +msgstr "Kopioi valitut omat solmut yhdistelmälistan yläpäähän" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452 msgid "> bottom" -msgstr "" +msgstr "alas" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454 msgid "Copy my selected elements to the end of the list of merged elements." -msgstr "" +msgstr "Kopioi valitut omat kohteet yhdistelmälistan alapäähän" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481 @@ -4912,4 +4986,6 @@ "merged elements." msgstr "" +"Kopioi valitut omat kohteet ensimmäisen yhdistelmälistalta valitun kohteen " +"edelle" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515 @@ -4918,13 +4994,15 @@ "merged elements." msgstr "" +"Kopioi valitut omat kohteet ensimmäisen yhdistelmälistalta valitun kohteen " +"perään" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544 msgid "" "Copy their selected element to the start of the list of merged elements." -msgstr "" +msgstr "Kopioi valitut muiden kohteet yhdistelmälistan yläpäähän" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566 msgid "Copy their selected elements to the end of the list of merged elements." -msgstr "" +msgstr "Kopioi valitut muiden kohteet yhdistelmälistan alapäähän" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588 @@ -4933,4 +5011,6 @@ "of merged elements." msgstr "" +"Kopioi valitut muiden kohteet ensimmäisen yhdistelmälistalta valitun kohteen " +"edelle" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617 @@ -4939,17 +5019,19 @@ "merged elements" msgstr "" +"Kopioi valitut muiden kohteet ensimmäisen yhdistelmälistalta valitun kohteen " +"perään" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643 msgid "Copy all my elements to the target" -msgstr "" +msgstr "Kopioi kaikki omat kohteet yhdistelmään" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669 msgid "Copy all their elements to the target" -msgstr "" +msgstr "Kopioi kaikki muiden kohteet yhdistelmään" #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Ylös" @@ -4980,23 +5062,23 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:762 msgid "Remove the selected entries from the list of merged elements." -msgstr "" +msgstr "Poista kaikki valitut rivit yhdistelmälistasta" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:791 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828 msgid "Freeze" -msgstr "" +msgstr "Lukitse" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829 msgid "Freeze the current list of merged elements." -msgstr "" +msgstr "Lukitsee yhdistelmälistan muutosten toteuttamista varten" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824 msgid "Unfreeze" -msgstr "" +msgstr "Vapauta" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825 msgid "Unfreeze the list of merged elements and start merging." -msgstr "" +msgstr "Vapauttaa yhdistelmälistan muokattavaksi" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850 @@ -5006,4 +5088,6 @@ "html>" msgstr "" +"Aloita omien ja muitten rivien yhdistely painamalla {0}." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855 @@ -5013,4 +5097,6 @@ "html>" msgstr "" +"Päätä omien ja muitten rivien yhdistely painamalla {0}." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873 @@ -5018,6 +5104,6 @@ msgid "My version ({0} entry)" msgid_plural "My version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Oma versio ({0} rivi)" +msgstr[1] "Oma versio ({0} riviä)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:876 @@ -5025,6 +5111,6 @@ msgid "Merged version ({0} entry)" msgid_plural "Merged version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Yhdistelmäversio ({0} rivi)" +msgstr[1] "Yhdistelmäversio ({0} riviä)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:879 @@ -5032,6 +5118,6 @@ msgid "Their version ({0} entry)" msgid_plural "Their version ({0} entries)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Muitten versio ({0} rivi)" +msgstr[1] "Muitten versio ({0} riviä)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:942 @@ -5042,4 +5128,6 @@ "adjustment." msgstr "" +"Muokattava {0} on vielä rekisteröimättä. Sitä ei voida ottaa mukaan " +"synkronoituun muokkaukseen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957 @@ -5047,5 +5135,5 @@ #, java-format msgid "Adjustable {0} not registered yet." -msgstr "" +msgstr "Muokattava {0} on vielä rekisteröimättä." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27 @@ -5056,4 +5144,6 @@ msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" +"Yhdistettyjä solmuja ei ole vielä lukittu. Toteutuskomentoa ei voida " +"rakentaa." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 @@ -5166,6 +5256,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5180,6 +5270,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5240,17 +5330,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Peruuta ristiriitojen selvitys" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5321,20 +5411,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5343,5 +5435,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5353,5 +5445,5 @@ msgstr[1] "{0} polkua" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5418,5 +5510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5534,5 +5626,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Yksityiskohtaiset tiedot" @@ -5936,5 +6028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Tee kopio tästä relaatiosta, ja avaa se muokkaimeen" @@ -6017,5 +6109,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6221,7 +6313,7 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" -msgstr "Avoin" +msgstr "Avaa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46 @@ -7072,5 +7164,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7641,5 +7733,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7770,5 +7862,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7826,26 +7918,26 @@ msgstr "({0}/{1}): Ladataan relaatio ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tagit ja jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Emorelaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Lapsirelaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aseta rooli:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7857,14 +7949,14 @@ "
Mitä syklisille riippuvuuksille tehdään?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Poista ne, siivoa relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ei mitään, jätä relaatio silleen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7876,9 +7968,9 @@ "''{0}''

Lisätäänkö uusi jäsen silti relaatioon?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Useat jäsenet viittaavat samaan objektiin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7890,5 +7982,5 @@ "riippuvuuteen, jota on syytä välttää.
Ohitetaan relaatio ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7897,5 +7989,5 @@ "edelle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7904,5 +7996,5 @@ "perään" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7912,5 +8004,5 @@ "jäsenen edelle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7920,15 +8012,15 @@ "jäsenen perään" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Poista kaikki jäsenet, jotka viittaavat valittuihin objekteihin" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Relaatiomuokkain: Poista valitut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7937,5 +8029,5 @@ "objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7946,64 +8038,64 @@ "objektiin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Valitse objektit, joihin valitut relaatiojäsenet viittaavat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Lajittele relaation jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Järjestä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Relaatiomuokkain: Lajittele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Käännä jäsenten järjestys ympäri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Käännä järjestys" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Relaatiomuokkain: Käännä järjestys" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Siirrä valittuja jäseniä ylöspäin" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Relaatiomuokkain: Siirrä ylöspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Siirrä valittuja jäseniä alaspäin" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Relaatiomuokkain: Siirrä alaspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Poista valitut jäsenet tästä relaatiosta" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Relaatiomuokkain: Poista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Poista relaatio, jota ollaan muokkaamassa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8015,23 +8107,23 @@ "muokattiin. Ne on poistettu relaation jäsenluettelosta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Luo ristiriita ja sulje relaatiomuokkain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Palaa muokkaimeen jatkamaan relaation muokkaamista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8043,5 +8135,5 @@ "suljetaan muokkain?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8052,50 +8144,50 @@ "ensin aiempi ristiriita, ja yritä sitten uudelleen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Tee muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Tee muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Peruuta muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Lataa kaikki keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Relaatiomuokkain: Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Lataa valitut keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Aseta rooli valituille jäsenille" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aseta rooli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8104,27 +8196,33 @@ msgstr[1] "Olet antamassa tyhjän roolin {0} objektille." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Se vastaa roolin poistamista näiltä objekteilta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Muokkaa relaatiota, johon valittu relaatiojäsen viittaa" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8418,5 +8516,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148 msgid "Areas around places" -msgstr "" +msgstr "Paikkojen ympäristössä olevat alueet" #. SAXException does not chain correctly @@ -8459,5 +8557,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9227,5 +9325,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Discard and Delete" -msgstr "" +msgstr "Hylkää ja poista" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324 @@ -9940,12 +10038,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Lataa kaikki alueella:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9953,8 +10055,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Yhden pyynnön enimmäisalue:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9978,4 +10082,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10414,10 +10519,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10426,5 +10531,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12613,5 +12718,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12620,53 +12725,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Lisää tietoja tästä ominaisuudesta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Lisäominaisuudet:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Tuntematon tyyppi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12676,15 +12777,15 @@ msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Virhe käsiteltäessä {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12694,18 +12795,18 @@ msgstr[1] "Muuta {0} objektia" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Ei mitään valittuna!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Valinta ei ole sopiva!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Muuta ominaisuuksia" @@ -12720,4 +12821,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Etsi" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Etsi kohteita." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Sovita näkymä valintaan" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Etsi kohteita." #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13430,5 +13555,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13440,10 +13565,10 @@ msgstr "OSM-palvelintiedostot" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13452,5 +13577,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14183,11 +14308,11 @@ msgstr "Ladataan listaa liitännäisistä..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14196,16 +14321,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14214,5 +14339,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14487,5 +14612,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15205,14 +15330,14 @@ msgstr "Rakennukset" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15244,5 +15369,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15299,5 +15424,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15305,5 +15430,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15312,5 +15437,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -15318,17 +15443,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15337,13 +15462,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15368,13 +15493,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15430,5 +15559,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15439,13 +15568,13 @@ msgstr "vesi" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15493,5 +15622,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15499,26 +15628,26 @@ msgstr "osoite" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15530,18 +15659,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Ranskan kiinteistörekisteri-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15549,5 +15678,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15555,127 +15684,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Kuvan resoluutio:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Korkea resoluutio (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Keskitasoinen resoluutio (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Matala resolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15683,5 +15817,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16072,4 +16206,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Lataa objekti..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Lataa valittujen relaatioiden kaikki jäsenet" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Lataa nyt" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Valitse vähintään yksi ladattava tietolaji." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Testi {0}/{1}: Aloitetaan {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Ladataan {0}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16159,5 +16328,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16240,5 +16409,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Päivitä" @@ -16791,30 +16960,31 @@ msgstr "Mittaukset" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16930,13 +17100,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17442,9 +17612,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17487,5 +17652,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17513,10 +17678,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18696,47 +18861,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "Valitse, lisätäänkö data uudelle tasolle" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18975,14 +19140,50 @@ msgstr "Risteävät polut" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Päällekkäiset pisteet" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Päällekkäiset pisteet" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Päällekkäiset pisteet" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Päällekkäiset pisteet" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Päällekkäiset pisteet" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Päällekkäiset pisteet" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Päällekkäiset pisteet" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -19137,59 +19338,59 @@ msgstr "Päällekkäiset polut" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20060,9 +20261,9 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20071,46 +20272,46 @@ "resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Vaihda resoluutiota" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Tallenna WMS-taso tiedostoon" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Lataa WMS-taso tiedostosta" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Virhe ladattaessa tiedostoa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -20253,231 +20454,125 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "raja" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Mittaukset" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Putki" + +#. relation type +#: build/specialmessages.java:21 +msgctxt "Relation type" msgid "multipolygon" msgstr "" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Taideteos" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "julkinen liikenne" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Kielto" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "reitti" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Liitä" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vesiväylä" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "Luo uusi hakemisto" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -20485,90 +20580,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "Tiedoston nimi:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:37 -msgid "Files of type:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:38 -msgid "Files of Type:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:40 -msgid "Filter:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:41 -msgid "Folders" -msgstr "" +msgstr "Tiedoston nimi:" #. Strings in JFileChooser #: build/specialmessages.java:43 +msgid "FileChooser help." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:44 +msgid "Files" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:45 +msgid "Files of type:" +msgstr "Tiedoston tyyppi:" + +#. Strings in JFileChooser +#: build/specialmessages.java:46 +msgid "Files of Type:" +msgstr "Tiedoston tyyppi:" + +#. Strings in JFileChooser +#: build/specialmessages.java:48 +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 msgid "Home" msgstr "Kotihakemisto" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "Uusi hakemisto" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -20576,75 +20671,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "Tallenna:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "Yksi taso ylöspäin" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "Päivitä" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20701,11 +20796,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20714,20 +20815,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20737,10 +20838,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20748,5 +20849,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20756,15 +20857,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20773,5 +20874,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20781,15 +20882,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20797,5 +20898,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20803,5 +20904,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20810,5 +20911,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20817,10 +20918,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20828,15 +20929,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20846,5 +20947,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20853,10 +20954,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20865,5 +20966,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20872,15 +20973,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20890,10 +20991,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20902,5 +21003,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20909,5 +21010,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20916,10 +21017,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20928,5 +21029,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20936,5 +21037,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20943,15 +21044,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20960,5 +21061,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27553,10 +27654,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Putki" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "moottoritien_ramppi" #. item "Man Made/Power Line" combo "Voltage" @@ -32918,4 +33023,177 @@ msgstr "ranta" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "reitti" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "raja" + #. color deprecated #. @@ -33944,7 +34222,4 @@ #~ "Sisäinen virhe: tallennuskelpoisuuden tarkistus ei onnistu ilman avoimia " #~ "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä." - -#~ msgid "Please select at least one task to download" -#~ msgstr "Valitse vähintään yksi ladattava tietolaji." #~ msgid "Open images with AgPifoJ..." Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 22464) +++ applications/editors/josm/i18n/po/fr.po (revision 22465) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-09 09:48+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-24 21:35+0000\n" +"Last-Translator: Vincent Calame \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: 2010-07-11 18:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -22,11 +22,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Aide" @@ -39,5 +39,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -70,7 +70,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ "Le paramètre \"downloadgps\" n’accepte pas de noms ni d'URL de fichiers." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -235,8 +235,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -246,13 +246,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -268,5 +269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -275,5 +276,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -290,13 +292,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Annuler" @@ -358,11 +360,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -409,6 +411,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -436,5 +439,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -541,10 +544,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:384 msgid "Close open changesets" -msgstr "Fermer les groupes de modifications" +msgstr "Fermer les groupes de modifications ouverts" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" -msgstr "Fermer les groupes de modifications" +msgstr "Ferme les groupes de modifications ouverts" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 @@ -558,5 +561,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -566,5 +569,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81 msgid "There are no open changesets" -msgstr "Il n'y a pas de groupe de modifications ouvert" +msgstr "Il n'y a pas de groupes de modifications ouvert" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 @@ -620,6 +623,6 @@ msgstr "Veuillez sélectionner au moins deux chemins à fusionner." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -628,9 +631,9 @@ msgstr "Copier" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Copier les objets sélectionnés dans le presse-papier" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Veuillez sélectionner quelque chose à copier." @@ -665,6 +668,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -733,5 +736,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Calque séparé" @@ -751,5 +754,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Type d’objet :" @@ -760,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID de l'objet :" @@ -804,5 +807,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Dupliquer" @@ -952,26 +955,26 @@ msgstr "Pas d’intersection trouvée. Rien n’a été modifié." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Nœuds ajoutés sur toutes les intersections" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" "Supprimer les chemins qui ne font pas partie d’un multipolygone interne" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Corriger les relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "A fusionné une aire superposée sur elle-même" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "A fusionné des aires superposées" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -981,33 +984,33 @@ "vérifier qu’aucune erreur n’a été introduite." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Entrer des valeurs pour tous les conflits." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Résoudre les conflits d’attributs" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Élément supprimé des relations" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Joindre les aires : supprimer les chemins courts" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Chemin fermé" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Supprime les attributs des chemins internes" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Fonction de jonction des aires" @@ -1026,5 +1029,5 @@ msgstr "Joindre le nœud et la ligne" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Pas de raccourci" @@ -1397,6 +1400,6 @@ "Veuillez sélectionner des chemins avec des angles de 90° ou 180° environ." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1407,17 +1410,17 @@ msgstr "Coller" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Coller les contenus du presse-papier" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Supprimer les membres incomplets ?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Coller sans les membres incomplets" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1429,15 +1432,15 @@ "les primitives incomplètes ?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Coller les attributs" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" "Appliquer les attributs du contenu du presse-papier aux éléments sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1446,5 +1449,5 @@ msgstr[1] "Collage des tags {0}" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1513,5 +1516,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1522,12 +1525,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1554,6 +1557,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Erreur" @@ -1581,5 +1584,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Enregistrer" @@ -2006,4 +2009,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Télécharger les données." @@ -2496,4 +2500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2634,5 +2639,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" -msgstr "Entrer le texte à rechercher." +msgstr "Entrez l'expression de recherche" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 @@ -2836,5 +2841,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filtrez" @@ -2860,8 +2865,11 @@ " {0}" msgstr "" +"L'expression de recherche n'est pas valide : \n" +"\n" +" {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 msgid "Invalid search expression" -msgstr "" +msgstr "Expression de recherche invalide" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -3050,5 +3058,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3069,9 +3077,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3174,5 +3182,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Double conflit" @@ -3271,5 +3279,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3283,5 +3291,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Confirmation de suppression" @@ -3472,11 +3480,42 @@ msgstr "Attributs de " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Rôles de la relation de référence" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Correction automatique d’attribut" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Ignorer les vieilles sauvegardes ?" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Erreur lors de la création du dossier de cache : {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3709,5 +3748,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3717,5 +3756,5 @@ "inclue" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3759,5 +3798,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3805,6 +3844,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3816,5 +3854,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3826,7 +3863,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4026,13 +4062,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Guyane RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 msgid "UTM France (DOM)" -msgstr "" +msgstr "UTM France (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 msgid "UTM Geodesic system" -msgstr "" +msgstr "Système UTM Geodesic" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4053,7 +4089,7 @@ msgstr "Ne plus afficher (choix mémorisé)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4061,29 +4097,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incomplet" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "route" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "voie ferrée" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "voie fluviale" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "utilisation du terrain" @@ -4091,7 +4127,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4103,5 +4139,5 @@ msgstr[1] "{0} nœuds" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "transport public" @@ -4160,6 +4196,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4167,6 +4203,6 @@ msgstr "bâtiment" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4175,5 +4211,5 @@ msgstr[1] "{0} membres" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4248,5 +4284,5 @@ msgstr "Objet supprimé" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4351,29 +4387,29 @@ msgstr "Mot de passe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "usage" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "Options" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Montrer cette aide" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Argument de géométrie standard UNIX" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Télécharger la zone délimitée" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Télécharger le lieu se rapportant à l’URL (avec lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" @@ -4381,9 +4417,9 @@ "Fichier/Ouvrir)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Télécharger la zone délimitée en données GPS brutes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" @@ -4391,34 +4427,34 @@ "lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Sélectionner avec la recherche actuelle" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Lancer maximisé" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Rétablir les préférences par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Définissez la langue" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +msgid "options provided as Java system properties" +msgstr "" +"options disponibles en tant que fichiers de propriétés système pour Java" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" -msgstr "" -"options disponibles en tant que fichiers de propriétés système pour Java" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Changer le répertoire pour tous les paramètres utilisateur" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4431,9 +4467,9 @@ " pour spécifier la taille maximale de mémoire allouée en mégaoctets" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "exemples" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4443,46 +4479,62 @@ "cet ordre." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Assurez-vous de charger des données si vous utilisez --sélection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Initialisation" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Mise à jour des greffons..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Installation des greffons mis à jour" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Chargement des premiers greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Régalage des valeurs par défaut" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Création de l’interface graphique" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Chargement des greffons" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Résoudre" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "L’option {0} a été supprimée car elle n’est plus utilisée." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Fichier" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4501,10 +4553,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4512,10 +4564,11 @@ msgstr "Outils" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Pré-réglages" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4526,5 +4579,5 @@ msgstr "Menu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4807,5 +4860,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4823,5 +4876,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5048,5 +5101,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Monter" @@ -5276,6 +5329,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5290,6 +5343,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5352,17 +5405,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Annuler la résolution des conflits" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Résoudre les conflits" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5434,20 +5487,22 @@ msgstr "Conflits entre des attributs collés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Coller…" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "De…" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "Vers..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5456,5 +5511,5 @@ msgstr[1] "{0} attributs" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5466,5 +5521,5 @@ msgstr[1] "{0} chemins" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5535,5 +5590,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Valeur :" @@ -5658,5 +5713,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Détails" @@ -5842,5 +5897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57 msgid "Error in filter" -msgstr "" +msgstr "Erreur dans le filtre" #. translators notes must be in front @@ -6069,5 +6124,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Copier et modifier la relation dans une nouvelle fenêtre" @@ -6150,5 +6205,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6362,5 +6417,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Ouvert" @@ -7218,5 +7273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7840,5 +7895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7969,5 +8024,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8028,26 +8083,26 @@ msgstr "({0}/{1}) : téléchargement de la relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Attributs et membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relations parentes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relations enfants" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Appliquer le rôle :" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Entrer un rôle et l'appliquer aux membres sélectionnés de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8059,14 +8114,14 @@ "
Comment voulez-vous procéder avec des dépendances circulaires ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Les enlever, nettoyer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Les ignorer, laisser la relation telle quelle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8079,9 +8134,9 @@ "à la relation ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Plusieurs membres se rapportent à la même primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8094,15 +8149,15 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Ajouter les primitives sélectionnées devant le premier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "Ajouter les primitives sélectionnées après le dernier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8111,5 +8166,5 @@ "Ajouter les primitives sélectionnées devant le premier membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8118,5 +8173,5 @@ "Ajouter les primitives sélectionnées après le dernier membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -8124,10 +8179,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Éditeur de relation : supprimer la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8136,5 +8191,5 @@ "dans la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8145,64 +8200,64 @@ "dans la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Sélectionner les primitives correspondant aux membres de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Trier les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Éditeur de relation : trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Inverser l’ordre des membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Inverser" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Éditeur de relation : inverser" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Déplacer les membres sélectionnés vers le haut" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Éditeur de relation : déplacer vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Déplacer les membres sélectionnés vers le bas" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Éditeur de relation : déplacer vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Supprimer le membre sélectionné" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Éditeur de relation : retirer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Supprimer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8214,23 +8269,23 @@ "était ouvert. Ils ont été retirés de la liste des membres de la relation." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Oui, créer un conflit et fermer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Créer un conflit et fermer l’éditeur de relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Non, continuer les modifications." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Reprendre la modification de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8242,5 +8297,5 @@ "conflit et fermer l’éditeur ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8251,50 +8306,50 @@ "
Veuillez d’abord résoudre ce conflit puis réessayer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Mettre à jour la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Appliquer les modifications et fermer la fenêtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Annuler les modifications et fermer la fenêtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Ajouter un attribut vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Télécharger les membres incomplets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Télécharger les membres incomplets sélectionnés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Définir le rôle pour le membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Appliquer le rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8303,27 +8358,33 @@ msgstr[1] "Vous avez défini un rôle vide pour {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Èquivalent à suppimer les rôles de ces primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Voulez-vous vraiment appliquer le nouveau rôle?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Oui, l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Non, ne pas l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirmer le rôle vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Modifier la relation à laquelle se rapporte le membre sélectionné" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8676,5 +8737,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10288,12 +10349,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Télécharger depuis OSM le long de ce chemin" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Tout télécharger dans un rayon de :" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10301,8 +10366,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Aire maximale par requête:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10326,4 +10393,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10787,10 +10855,10 @@ msgstr[1] "{0} ont un attribut GPS." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Supprimer le fichier de l'image du disque" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10801,5 +10869,5 @@ "perdu !" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Le fichier de l'image n'a pas pu être supprimé." @@ -12305,5 +12373,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126 msgid "Enter a search expression" -msgstr "Entrer une expression" +msgstr "Entrez une expression de recherche" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172 @@ -13201,5 +13269,5 @@ msgstr "Ajouter un nouvel attribut" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -13210,53 +13278,49 @@ "display_values doit être le même que dans les valeurs" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Plus d’infos sur cette caractéristique" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "Prérequis inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Rôles disponibles" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "rôle" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "nombre" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "éléments" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Attributs optionnels :" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "chemin fermé" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Type inconnu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "Élément de rôle prédéfini sans parent" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "Sous élément prédéfini sans parent" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -13266,15 +13330,15 @@ msgstr "Impossible de lire la source des balises : {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Erreur d’analyse de {0} : " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Les éléments de type {0} sont supportés." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13284,18 +13348,18 @@ msgstr[1] "Modifier {0} objets" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Rien n’est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Appliquer le pré-réglage" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Changer les propriétés" @@ -13304,10 +13368,34 @@ #, java-format msgid "Preset group {1} / {0}" -msgstr "Groupe de balises {1} / {0}" +msgstr "Groupe d’attributs {1} / {0}" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26 #, java-format msgid "Preset group {0}" -msgstr "Groupe de balises {0}" +msgstr "Groupe d’attributs {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Rechercher : " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Rechercher les objets" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Afficher le nom traduit dans les listes de sélection" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Rechercher : " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -14098,5 +14186,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -14108,5 +14196,5 @@ msgstr "Fichiers du serveur OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" @@ -14115,5 +14203,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -14124,5 +14212,5 @@ "
Erreur :
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14935,11 +15023,11 @@ msgstr "Téléchargement de la liste des greffons..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Téléchargement de la liste des greffons depuis ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14950,16 +15038,16 @@ "Impossible de mettre en cache la liste des greffons depuis le site ''{1}''." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Écriture de la liste des greffons dans le cache ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Analyse de la liste des greffons du site ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14970,5 +15058,5 @@ "site. Exception : {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -15306,5 +15394,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16041,5 +16129,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19 msgid "Big buildings mode" -msgstr "" +msgstr "Mode de grand bâtiments" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20 @@ -16049,9 +16137,9 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23 msgid "Advanced settings" -msgstr "" +msgstr "Paramètres avancés" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30 msgid "Building tag:" -msgstr "" +msgstr "Attribut de bâtiment :" #: ../plugins/buildings_tools/src/buildings_tools/Building.java:234 @@ -16076,5 +16164,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27 msgid "Auto-select building" -msgstr "" +msgstr "Sélectionner automatiquement le bâtiment" #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44 @@ -16088,5 +16176,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54 msgid "Advanced..." -msgstr "" +msgstr "Avancé..." #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65 @@ -16097,25 +16185,25 @@ #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379 msgid "Point on the corner of the building to start drawing" -msgstr "" +msgstr "Pointez sur le coin du bâtiment pour commencer à dessiner" #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381 msgid "Point on opposite end of the building" -msgstr "" +msgstr "Pointez sur le coin opposé du bâtiment" #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383 msgid "Set width of the building" -msgstr "" +msgstr "Saisissez la largeur du bâtiment" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 msgid "on polygon" -msgstr "" +msgstr "sur le polygone" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "" +msgstr "Ajoutez l'adresse" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 msgid "Helping tool for tag address" -msgstr "" +msgstr "Outil d'aide pour la balise d'adresse" #. group "Man-Made" @@ -16126,16 +16214,16 @@ msgstr "Bâtiments" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +msgstr "Num. suivant" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Rue" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" -msgstr "" +msgstr "Saisissez les adresses" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16170,5 +16258,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Sélectionner la feuille cadastrale." @@ -16227,5 +16315,5 @@ msgstr "CadastreGrabber : l’URL est erronée." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -16235,5 +16323,5 @@ "Le serveur est en maintenance ou saturé." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -16244,5 +16332,5 @@ "ou action annulée" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Choisir parmi…" @@ -16250,17 +16338,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Sélectionner la commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Enregistrement automatique de la source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -16274,13 +16362,13 @@ "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Restaurer la fontion de téléchargement à la touche F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM est arreté pour que la modification prenne effet." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -16307,15 +16395,22 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Désactiver le recadrage pendant le géoréférencement." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Sélectionner le tableau d'assemblage" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "Sélectionner le premier calque WMS dans la liste" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" +"N'utilisez pas de relation pour les adresses (mais plutôt \"addr:street\" " +"sur les éléments)" #. item "Man Made/Pipeline" combo "Type" @@ -16369,5 +16464,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -16378,13 +16473,13 @@ msgstr "eau" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "symbole" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "parcelle" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "numéro de parcelle" @@ -16432,5 +16527,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -16438,26 +16533,26 @@ msgstr "adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "lieu-dit" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "section" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Activer le tampon automatique." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Taille maximale du tampon (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16474,9 +16569,9 @@ "CU_01_ConditionsGenerales_fr.html
" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS du cadastre français" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -16484,10 +16579,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16497,5 +16592,5 @@ "préférences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16505,9 +16600,9 @@ "intermédiaires). Pratique pour lire les textes sur fond noir." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Permettre l’empilement de plusieurs calques" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16515,5 +16610,5 @@ "gauche)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" @@ -16521,48 +16616,48 @@ #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Résolution de l’image :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Haute résolution (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Résolution moyenne (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Basse résolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "filtre d’interpolation" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Par plus proche voisin (rapide) [ Par défaut ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilinéaire (rapide)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bicubique (lent)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Multiplicateur d’images" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Télécharger une seule image en plein écran" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" @@ -16570,63 +16665,68 @@ "mémoire)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Carré de taille fixe (100 m par défaut)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Taille fixe (de 25 à 1000 mètres)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Calques :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "Mers, fleuves, rivières, piscines." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Bâtiments, constructions." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Symboles." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Parcelles." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Numéros des parcelles, noms des rues." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Adresses, numéros d’adresses." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Lieu-dit, hameau, site." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Sections et sous-sections cadastrales." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Limites communales" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Multiplicateur d’images matricielles" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Afficher les chevauchements :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16634,5 +16734,5 @@ "taille est dépassée" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16642,7 +16742,7 @@ "cadastre." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." -msgstr "" +msgstr "Activez ceci afin d'utiliser le tag \"add:street\" sur les nœuds." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -17064,4 +17164,40 @@ msgid "TCX Files (*.tcx)" msgstr "fichiers TCX (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Télécharger un objet..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "" +"Télécharger les données cartographiques sur la fin de la voie sélectionnée" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Télécharger maintenant" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Veuillez sélectionner au moins une tâche à télécharger" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1} : {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Erreur lors de l’analyse syntaxique de {0} : {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -17131,13 +17267,13 @@ #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188 msgid "Child script have returned invalid data." -msgstr "" +msgstr "Le script enfant a retourné des données invalides." #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45 msgid "Edit tool" -msgstr "" +msgstr "Outil d'édition" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53 msgid "Name:" -msgstr "" +msgstr "Nom :" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54 @@ -17147,11 +17283,11 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26 msgid "External tools" -msgstr "" +msgstr "Outils externes" #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" -msgstr "" +msgstr "Utiliser des scripts externes dans JOSM" #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73 @@ -17166,9 +17302,9 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91 msgid "New tool..." -msgstr "" +msgstr "Nouvel outil..." #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54 msgid "Install" -msgstr "" +msgstr "Installer" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81 @@ -17234,5 +17370,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Actualiser" @@ -17795,9 +17931,10 @@ msgstr "Mesures" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Michigan Left" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" @@ -17805,5 +17942,5 @@ "\"Michigan\")" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" @@ -17811,18 +17948,18 @@ "tourner à gauche" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Veuillez sélectionner 4 chemins qui forment une relation fermée." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Impossible d’ordonner les chemins. Merci de vérifier leurs sens." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Créer une interdiction de tourner à gauche de type \"Michigan\"" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -17946,13 +18083,13 @@ msgstr "Mettre en file d’attente" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "déconnecté" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "connecté" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -18469,9 +18606,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "La cible de type {0} avec un id {1} est une version invalide" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18514,19 +18646,20 @@ msgstr "Réversion du groupe de changement #{0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" -msgstr "" +msgstr "Greffon de Signalisation Routière" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53 msgid "Roadsign tagging" -msgstr "" +msgstr "Balisage des panneaux de signalisation routière" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53 msgid "Add tags by clicking on road signs" msgstr "" +"Ajouter des attributs en cliquant sur des panneaux de signalisation routière" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54 msgid "Roadsigns plugin: open dialog" -msgstr "" +msgstr "Greffon de Signalisation Routière : ouvrir une fenêtre" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:89 @@ -18540,13 +18673,13 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" -msgstr "" - -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +msgstr "Signalisation {0}" + +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" -msgstr "" +msgstr "Signalisation additionnelle {0}" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28 @@ -18656,9 +18789,9 @@ #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42 msgid "Simplify Area" -msgstr "" +msgstr "Simplifier la zone" #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41 msgid "Delete unnecessary nodes from an area." -msgstr "" +msgstr "Supprime les nœuds inutiles d'une zone." #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 @@ -18871,15 +19004,17 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29 msgid "Tagging Preset Tester" -msgstr "Vérificateur de balises" +msgstr "Vérificateur d’attributs" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27 msgid "" "Open the tagging preset test tool for previewing tagging preset dialogs." -msgstr "Ouvrir l’outil de vérification des balises afin de les prévisualiser." +msgstr "" +"Ouvrir l’outil de vérification des attributs afin de les prévisualiser." #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43 msgid "You have to specify tagging preset sources in the preferences first." msgstr "" -"Vous devez d’abord spécifier les sources des balises dans les préférences." +"Vous devez d’abord spécifier les sources de pré-réglage des attributs dans " +"les préférences." #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:59 @@ -19126,5 +19261,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138 msgid "Edit the raw tags and members of this turn restriction" -msgstr "Éditer les balises et les membres de cette interdiction de tourner" +msgstr "Éditer les attributs et les membres de cette interdiction de tourner" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141 @@ -19640,5 +19775,5 @@ msgstr "" "Cette interdiction de tourner utilise une restriction de type non standard " -"{0} comme valeur de balise restriction. Il est recommandé " +"{0} comme valeur d’attribut restriction. Il est recommandé " "d'utiliser uniquement des valeurs standardisées. Veuillez en choisir une " "dans l'éditeur." @@ -19746,5 +19881,5 @@ "recommended to use standard values for except only." msgstr "" -"La balise except a la valeur non standard {0}. Il est " +"L’attribut except a la valeur non standard {0}. Il est " "recommandé de n'utiliser que des valeurs standard pour except." @@ -19758,14 +19893,14 @@ #, java-format msgid "The required tag {0}={1} is missing." -msgstr "La balise requise {0}={1} manque." +msgstr "L’attribut {0}={1} manque." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45 msgid "Add missing tag" -msgstr "Ajouter la balise manquante" +msgstr "Ajouter l’attribut manquant" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46 #, java-format msgid "Add the missing tag {0}={1}" -msgstr "Ajouter la balise manquante {0}={1}" +msgstr "Ajouter l’attribut manquant {0}={1}" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52 @@ -19816,48 +19951,48 @@ msgstr "Passer dans l'éditeur basic et sélectionner un chemin OSM" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "Restaurer l'objet" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "Réstaurer l'objet par id" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" "Sélectionner si les données doivent être ajoutées dans un nouveau calque" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "Entrer l'ID de l'objet à restaurer" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "Restaurer l'objet" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "Restaurer l'objet" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "Début de la restauration" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "Fermer la boîte de dialogue et annuler" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "Va obtenir {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "Recherche de {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -20035,5 +20170,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:468 msgid "Fixing errors ..." -msgstr "Correction deserreurs…" +msgstr "Correction des erreurs…" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:491 @@ -20098,14 +20233,50 @@ msgstr "Chemins se croisant" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Nœuds dupliqués" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Vérifier si des nœuds occupent exactement la même position." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Fusionner les nœuds dupliqués ?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Nœuds dupliqués" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Nœuds dupliqués" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Fusionner les nœuds dupliqués ?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Nœuds dupliqués" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Fusionner les nœuds dupliqués ?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Nœuds à la même position" @@ -20266,59 +20437,59 @@ msgstr "Chemins superposés" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "Vérificateur de relation :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "Ce greffon vérifie les erreurs dans les relations." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "Le type de relation est inconnu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "La relation est vide" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "Le rôle {0} manque" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "Problème de vérification de rôle" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "Nombre de rôles {0} trop bas ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "Nombre de rôles {0} trop élevé ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "Membre du rôle {0} du mauvais type" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "Rôle {0} inconnu" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "Rôle vide trouvé" @@ -20386,18 +20557,18 @@ msgid "Tag value contains character with code less than 0x20" msgstr "" -"La valeur de la balise contient un caractère avec un code inférieur à 0x20" +"La valeur de l’attribut contient un caractère avec un code inférieur à 0x20" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479 msgid "Tag key contains character with code less than 0x20" msgstr "" -"La clé de la balise contient un caractère avec un code inférieur à 0x20" +"La clé de l’attribut contient un caractère avec un code inférieur à 0x20" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485 msgid "Tag value longer than allowed" -msgstr "Valeur de la balise plus longue qu'autorisée" +msgstr "Valeur de l’attribut plus longue qu'autorisée" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:491 msgid "Tag key longer than allowed" -msgstr "Clé de la balise plus longue qu'autorisée" +msgstr "Clé de l’attribut plus longue qu'autorisée" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497 @@ -20424,18 +20595,19 @@ #, java-format msgid "Key ''{0}'' not in presets." -msgstr "La clé \"{0}\" ne fait pas partie des balises." +msgstr "La clé « {0} » ne fait pas partie des pré-réglages." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549 msgid "Presets do not contain property key" -msgstr "Les balises ne contiennent pas de clé de propriété" +msgstr "Les pré-réglages ne contiennent pas de clé d’attribut" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:571 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "La valeur \"{0}\" pour la clé \"{1}\" ne fait pas partie des balises." +msgstr "" +"La valeur « {0} » pour la clé « {1} » ne fait pas partie des pré-réglages." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:572 msgid "Presets do not contain property value" -msgstr "Les balises ne contiennent pas de valeur de propriété" +msgstr "Les pré-réglages ne contiennent pas de valeur d’attribut" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584 @@ -20499,5 +20671,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746 msgid "Validate that property values are valid checking against presets." -msgstr "Valider les valeurs de propriété avec les balises." +msgstr "Valider les valeurs d’attribut par rapport aux pré-réglages." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 @@ -20716,5 +20888,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 msgid "No tags" -msgstr "" +msgstr "Aucun attribut" #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. @@ -20724,30 +20896,30 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 msgid "Unconnected nodes without physical tags" -msgstr "" +msgstr "Nœuds non connectés et sans attribut physique" #. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 msgid "Has tag containing ''fixme'' or ''FIXME''" -msgstr "" +msgstr "A une attribut contenant « fixme » ou « FIXME »" #. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" -msgstr "" +msgstr "A une clé \"note\", \"comment\" ou \"description\"" #. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" -msgstr "" +msgstr "A une clé \"created_by\" ou \"converted_by\"" #. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" -msgstr "" +msgstr "A une clé \"watch\"" #. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" -msgstr "" +msgstr "A une clé \"source\"" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62 @@ -20769,5 +20941,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 msgid "Untagged ways (commented)" -msgstr "" +msgstr "Chemins non balisés (commentés)" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20812,130 +20984,130 @@ #, java-format msgid "{0} {1}% of GPS track" -msgstr "" +msgstr "{0} {1}% des traces GPS" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110 msgid "Shows current position in the video" -msgstr "" +msgstr "Affiche la position actuelle dans la vidéo" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113 msgid "Import Video" -msgstr "" +msgstr "Importer une vidéo" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113 msgid "Sync a video against this GPS track" -msgstr "" +msgstr "Synchroniser une vidéo avec une trace GPS" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137 msgid "Remove Video" -msgstr "" +msgstr "Supprimer une vidéo" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137 msgid "removes current video from layer" -msgstr "" +msgstr "supprime la vidéo actuelle du calque" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144 msgid "play/pause" -msgstr "" +msgstr "jouer/pause" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144 msgid "starts/pauses video playback" -msgstr "" +msgstr "démarre/pause la reproduction vidéo" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151 msgid "backward" -msgstr "" +msgstr "recule" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151 msgid "jumps n sec back" -msgstr "" +msgstr "recule de n secondes" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159 msgid "forward" -msgstr "" +msgstr "avance" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159 msgid "jumps n sec forward" -msgstr "" +msgstr "avance de n secondes" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167 msgid "faster" -msgstr "" +msgstr "plus rapide" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167 msgid "faster playback" -msgstr "" +msgstr "reproduction plus rapide" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175 msgid "slower" -msgstr "" +msgstr "plus lent" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175 msgid "slower playback" -msgstr "" +msgstr "reproduction plus lente" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:102 msgid "loop" -msgstr "" +msgstr "en boucle" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183 msgid "loops n sec around current position" -msgstr "" +msgstr "reproduit en boucles les n secondes autour de la position actuelle" #. now the options menu #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193 msgid "Keep centered" -msgstr "" +msgstr "Garder centré" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193 msgid "follows the video icon automaticly" -msgstr "" +msgstr "suit l'icône de la vidéo automatiquement" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207 msgid "Jump length" -msgstr "" +msgstr "Durée du saut" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203 msgid "Set the length of a jump" -msgstr "" +msgstr "Précise la durée du saut" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218 msgid "Jump in video for x ms" -msgstr "" +msgstr "Saute la reproduction de x ms" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218 msgid "Loop length" -msgstr "" +msgstr "Durée de la boucle" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214 msgid "Set the length around a looppoint" -msgstr "" +msgstr "Précise la durée de la boucle autour d'un point" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227 msgid "no deinterlacing" -msgstr "" +msgstr "pas de des-entrelacement" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:235 msgid "deinterlacing using line doubling" -msgstr "" +msgstr "des-entrelacement en utilisant le doublement de ligne" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243 msgid "deinterlacing using linear interpolation" -msgstr "" +msgstr "des-entrelacement en utilisant l'interpolation linéaire" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99 msgid "play" -msgstr "" +msgstr "lecture" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131 msgid "Unable to find JNA Java library!" -msgstr "" +msgstr "Impossible de trouver la librairie JNA Java !" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:135 msgid "Unable to find native libvlc library!" -msgstr "" +msgstr "Impossible de trouver la librairie native libvlc !" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 @@ -21217,9 +21389,9 @@ msgstr "URL invalide ?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Télécharger les tuiles visibles" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21227,33 +21399,33 @@ "La zone demandée est trop grande. Prière de changer le zoom ou la résolution." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Changer la résolution" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Recharger les tuiles erronées" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Canal alpha" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Sauvegarder un calque WMS dans un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Sauvegarder le calque WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Charger un calque WMS depuis un fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Charger le calque WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -21262,13 +21434,13 @@ "{1} attendue" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Erreur de format de fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Erreur lors du chargement du fichier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Placer un marque-page WMS" @@ -21338,5 +21510,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186 msgid "Simultaneous connections" -msgstr "" +msgstr "Connexions simultanées" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -21415,400 +21587,296 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "Créer une relation associatedStreet" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "frontière" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Incrément" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "à haute tension" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolygone" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Réseau" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "transport public" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Restriction" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "itinéraire" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Site" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "voie fluviale" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" -msgstr "" +msgid "All Files" +msgstr "Tous les fichiers" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" -msgstr "" +msgid "Attributes" +msgstr "Attributs" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " -msgstr "" +msgid "Abort file chooser dialog" +msgstr "Ferme la boîte de dialogue du sélecteur de fichiers" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" -msgstr "" +msgid "Abort file chooser dialog." +msgstr "Ferme la boîte de dialogue du sélecteur de fichiers." #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" -msgstr "" +msgid "Create New Folder" +msgstr "Créer un nouveau dossier" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" -msgstr "" +msgid "Delete File" +msgstr "Supprimer le fichier" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" -msgstr "" +msgid "Enter file name:" +msgstr "Entrez le nom du fichier :" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" -msgstr "" +msgid "Enter path or folder name:" +msgstr "Entrez le chemin d'accès ou le nom de dossier :" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " +msgstr "Erreur " #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" -msgstr "" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" +msgstr "Erreur lors du renommage du fichier \"{0}\" en \"{1}\"" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" -msgstr "" +msgid "File name:" +msgstr "Nom du fichier :" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" +msgstr "Nom du Fichier :" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" -msgstr "" +msgid "Files" +msgstr "Fichiers" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" -msgstr "" +msgid "Files of type:" +msgstr "Fichiers du type :" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" -msgstr "" +msgid "Files of Type:" +msgstr "Fichiers du type :" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" -msgstr "" +msgid "Filter:" +msgstr "Filtre :" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "Dossiers" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" +msgstr "Accueil" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" -msgstr "" +msgid "List" +msgstr "Liste" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." -msgstr "" +msgid "Look in:" +msgstr "Rechercher dans :" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" +msgstr "Rechercher dans :" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" -msgstr "" +msgid "Modified" +msgstr "Modifié" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" -msgstr "" +msgid "New Folder" +msgstr "Nouveau Dossier" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." -msgstr "" +msgid "Open selected file" +msgstr "Ouvrir le fichier sélectionné" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" -msgstr "" +msgid "Open selected file." +msgstr "Ouvrir le fichier sélectionné." #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" -msgstr "" +#: build/specialmessages.java:63 +msgid "Rename File" +msgstr "Renommer le Fichier" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" -msgstr "" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" +msgstr "Renommer le fichier \"{0}\" en" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "Enregistrer dans :" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "Enregistrer dans :" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "Enregistrer le fichier sélectionné." + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "Sélection :" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "Taille" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "Remonter d'un niveau" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Actualiser" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." -msgstr "" +msgstr "Mettre à jour la liste des fichiers dans ce dossier." #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" -msgstr "" +msgstr "Bleu :" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" -msgstr "" +msgstr "Nom de la couleur :" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" -msgstr "" +msgstr "Vert :" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" -msgstr "" +msgstr "Teinte :" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" -msgstr "" +msgstr "Rouge :" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" -msgstr "" +msgstr "Saturation :" #. Plugin AddrInterpolation @@ -21873,11 +21941,17 @@ msgstr "Charge directement les traces GPS du calque vers le serveur OSM." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Télécharger depuis OSM le long de ce chemin" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Chemins dupliqués avec un décalage" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21888,5 +21962,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -21895,15 +21969,15 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Visualise les informations comme un calque de calcul d’itinéraire." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Fournir un calque d’arrière plan en affichant une grille" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21916,10 +21990,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Aide à vectoriser des images WMS." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21929,5 +22003,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21940,5 +22014,5 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" @@ -21947,10 +22021,10 @@ #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Convertir une aire en multipolygone" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21961,5 +22035,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21971,15 +22045,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Affiche une image d’arrière plan provenant d’OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importe les erreurs d’OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21989,5 +22063,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21995,5 +22069,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -22004,5 +22078,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -22013,10 +22087,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ajoute le thème JGoodies." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -22025,15 +22099,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Permet à d’autres applications d’envoyer des commandes vers JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" -msgstr "" +msgstr "Greffon pour annuler des groupes de modifications" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -22043,5 +22117,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22053,10 +22127,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Fournit des capacités de calcul d’itinéraire." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22065,5 +22139,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22074,15 +22148,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Ouvre une fenêtre de modification des attributs sous forme de table." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22090,15 +22164,15 @@ "the jar-file as standalone as well." msgstr "" -"Ajoute un vérificateur de balises au menu d’aide qui vous aidera à " -"développer des balises (prévisualisation rapide). Vous pouvez démarrer le " -"fichier .jar indépendamment." +"Ajoute un vérificateur d’attribut qui vous aidera à développer des pré-" +"réglages (prévisualisation rapide). Vous pouvez démarrer le fichier .jar " +"indépendamment." #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Créer des maisons mitoyennes depuis des blocs entiers." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22107,5 +22181,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22116,5 +22190,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22125,10 +22199,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22139,5 +22213,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22147,5 +22221,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22156,15 +22230,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Sélectionne une séquence de chemins connectés non-ramifiés" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22174,5 +22248,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -28769,8 +28843,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "à haute tension" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "à basse tension" @@ -34134,4 +34212,177 @@ msgstr "plage" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "itinéraire" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "frontière" + #. color deprecated #. @@ -34650,4 +34901,10 @@ msgstr "Sicile - Italie" +#~ msgid "closedway" +#~ msgstr "chemin fermé" + +#~ msgid "Target of type {0} with id {1} has invalid version" +#~ msgstr "La cible de type {0} avec un id {1} est une version invalide" + #~ msgid "Move" #~ msgstr "Déplacer" @@ -35026,7 +35283,4 @@ #~ msgid "Some of the nodes are (almost) in the line" #~ msgstr "Certains points sont (presque) sur la ligne" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Veuillez sélectionner au moins une tâche à télécharger" #~ msgid "Really mark this issue as ''done''?" @@ -35361,7 +35615,4 @@ #~ "entre deux zones)" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Sélectionner le tableau d'assemblage" - #~ msgid "Lambert Zone 4 cache file (.4)" #~ msgstr "Fichier tampon de la zone Lambert 4 (.4)" Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 22464) +++ applications/editors/josm/i18n/po/gl.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-06-15 17:32+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-27 21:16+0000\n" "Last-Translator: Dario \n" "Language-Team: Galician \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Axuda" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "O parametro \"downloadgps\" non acepta nomes de ficheiros ou URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -235,8 +235,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -246,13 +246,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -268,5 +269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -275,5 +276,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -290,13 +292,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Cancelar" @@ -356,11 +358,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -407,6 +409,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -434,5 +437,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -556,5 +559,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -618,6 +621,6 @@ msgstr "Por favor, selecciona polo menos dúas vías para combinar." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -626,9 +629,9 @@ msgstr "Copiar" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Copiar os obxectos seleccionados ó buffer de pegado." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Por favor, selecciona algo para copiar" @@ -663,6 +666,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -732,5 +735,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Capa Distinta" @@ -751,5 +754,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Tipo de Obxecto:" @@ -760,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID do Obxecto" @@ -803,5 +806,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicar" @@ -950,25 +953,25 @@ msgstr "Nada interesante foi atopado. Nada foi cambiado..." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Engadir nodo en todas as interseccións" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Eliminiar vías que non formen parte de un multipolígono interior" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Arranxar relacións" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Areas auto-superpostas unidas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Areas superpostas unidas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -978,33 +981,33 @@ "verifique que non se introduciron erros." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Introducir valores para todos os conflitos." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Resolver Conflitos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Arranxar conflictos de etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Elementos borrados das Relacions" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Une Areas: Borra Vías" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Vía Pechada" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Eliminar etiquetas de vías internas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Función de unor áreas" @@ -1023,5 +1026,5 @@ msgstr "Unir Nodo e Liña" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Sen Atallo" @@ -1394,6 +1397,6 @@ "Por favor escolle vias con angulos de aproximadamente 90 ou 180 grados." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1404,17 +1407,17 @@ msgstr "Pegar" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Pegar contidos ó buffer de pegado." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Borrar os membros incompletos?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Pega sin membros incompletos" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1425,10 +1428,10 @@ "primitivas incompletas. ¿Quere pegar os datos sen as primitivas incompletas?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Pegar Etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1436,5 +1439,5 @@ "seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1443,5 +1446,5 @@ msgstr[1] "PEgando {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1510,5 +1513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1519,12 +1522,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1551,6 +1554,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Erro" @@ -1578,5 +1581,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Gardar" @@ -2004,4 +2007,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Descargar data" @@ -2485,4 +2489,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2815,5 +2820,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filtrar" @@ -3023,5 +3028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3042,9 +3047,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3147,5 +3152,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doble conflicto" @@ -3243,5 +3248,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3255,5 +3260,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Eliminar confirmación" @@ -3441,11 +3446,42 @@ msgstr "Propiedades de " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Papeis nas relacións que fan referencia a" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Corrección" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Erro obtendo ficheiros do directorio {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Sobreescribir os arquivos de respaldo antigos?" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Erro creando directorio caché: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3674,5 +3710,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3682,5 +3718,5 @@ "incluido" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3723,5 +3759,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3768,6 +3804,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3779,5 +3814,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3789,7 +3823,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4014,7 +4047,7 @@ msgstr "Non mostrar esto outra vez(recordar escolla)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4022,29 +4055,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "Carretera" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "Vía férrea" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "Vía acuática" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "uso da terra" @@ -4052,7 +4085,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4064,5 +4097,5 @@ msgstr[1] "{0} nodos" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "transporte público" @@ -4121,6 +4154,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4128,6 +4161,6 @@ msgstr "construcción" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4136,5 +4169,5 @@ msgstr[1] "{0} membros" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4209,5 +4242,5 @@ msgstr "Obxecto borrado" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4308,29 +4341,29 @@ msgstr "Contrasinal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "opcións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Amosar esta axuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Argumento de xeometría unix estandar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Descargar a caixa de límites" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" @@ -4338,41 +4371,41 @@ "Abrir)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Descargar a caixa de límites como datos gps en bruto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Descargar localozación na url (con lat=x&lon=y&zoom=z) como gps en crú" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Escoller coa busca indicada" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Lanzar en modo maximizado" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Restablecer as preferencias ós valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Establecer a linguaxe" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "opción dadas polas propiedades do sistema de Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/RUTA/Á/CARPETA/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Cambiar o directorio para as configuración de todos os usuarios" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4386,9 +4419,9 @@ "en megabytes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "exemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4398,46 +4431,62 @@ "orde." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Asegurate de que cargas algún dato se usas --selección." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Inicializando" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Actualizando Plugins..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Instalando plugins actualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Cargando extensións anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Establecendo valores predeterminados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Creando Interface (GUI) principal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Cargando extensións" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Resolver" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "A opción de configuración {0} foi eliminada porque xa non se usa." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Ficheiro" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4456,10 +4505,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4467,10 +4516,11 @@ msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Axustes prestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4481,5 +4531,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4764,5 +4814,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4780,5 +4830,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5005,5 +5055,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Arriba" @@ -5233,6 +5283,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5247,6 +5297,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5308,17 +5358,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Cancelar resolución de conflicto" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Aplicar a resolución de conflictos" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5390,20 +5440,22 @@ msgstr "Conflictos nas etiquetas pegadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Pegar ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Dende ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "A ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5412,5 +5464,5 @@ msgstr[1] "{0} etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5422,5 +5474,5 @@ msgstr[1] "{0} vías" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5490,5 +5542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Valor:" @@ -5615,5 +5667,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Detalles" @@ -6028,5 +6080,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Crear unha copia de esta relación e abrila en outra ventá de edición." @@ -6109,5 +6161,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6321,5 +6373,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Aberto" @@ -7173,5 +7225,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7769,5 +7821,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7899,5 +7951,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7954,26 +8006,26 @@ msgstr "({0}/{1}): Descargando relación \"{2}\"..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etiquetas e membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relacións pai" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relacións fillo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplicar papel:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Introduce un papel e aplicao aos membros da relación escollidos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7982,14 +8034,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Borraos, limpa a relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignoraos, deixa a relación como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7999,9 +8051,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Varios membros referidos á mesma primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8011,15 +8063,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8027,5 +8079,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8033,20 +8085,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8055,64 +8107,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Ordenar os membros da relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor de relacións: Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Invertir a orde dos membros da relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor de Relacións: Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Mover os membros actualmente seleccionados cara arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor de relacións: Mover Arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Mover os membros seleccionados actualmente cara abaixo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor de relacións: Mover Abaixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Borrar os membros escollidos para esta relación" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor de relación: Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Borrar a relación que se está a editar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8121,24 +8173,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Si, crear un conflicto e pechar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Prema para crear un conflicto e pechar este editor de relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Non, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" "Prema para volver ao editor de relación e continuar editando a relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8147,5 +8199,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8154,50 +8206,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplicar as actualizacións actuais" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Aplicar as actualizacións actuais e pecha o diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Pecha as actualizacións actuais e pecha o diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Engadir unha etiqueta baleira" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Descargar todos os membros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor de relación: Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Descargar membros escollidos incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8206,27 +8258,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Editar a relación a cal a relación escollida fai referencia" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8563,5 +8621,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10012,12 +10070,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Descargar de OSM ó longo desta pista" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Descargar todo o que abarca:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10025,8 +10087,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Área máxima por petición:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10050,4 +10114,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10485,10 +10550,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10497,5 +10562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12709,5 +12774,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12716,53 +12781,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Máis información acerca desta característica" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Atributos Opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "vía pechada" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Tipo descoñecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12772,15 +12833,15 @@ msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Erro analizando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Os elementos do tipo {0} están soportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12790,18 +12851,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -12816,4 +12877,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Buscar obxectos" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Buscar obxectos" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Facer zoom sobre a selección" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Buscar obxectos" #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13528,5 +13613,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13538,10 +13623,10 @@ msgstr "Ficheiros de Servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "Ocurriu un erro mentres se gardaba.
O Erro é:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13552,5 +13637,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14326,11 +14411,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14339,16 +14424,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14357,5 +14442,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14619,5 +14704,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15340,14 +15425,14 @@ msgstr "Construccións" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15379,5 +15464,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15436,5 +15521,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15444,5 +15529,5 @@ "O servidor esta baixo mantemento ou temporalmente sobrecargado." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15453,5 +15538,5 @@ "ou acción cancelada" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Escoller de..." @@ -15459,17 +15544,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Escoller común" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Catastro" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15478,13 +15563,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM esta parada para que o cambio surxa efecto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15511,13 +15596,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15573,5 +15662,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15582,13 +15671,13 @@ msgstr "auga" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "símbolo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "parcela" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "numero de parcela" @@ -15636,5 +15725,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15642,26 +15731,26 @@ msgstr "enderezo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "localidade" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "sección" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "común" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Activar caché automática." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Tamaño da caché max. (En MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15673,18 +15762,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Catastro francés WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Fonte" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15694,5 +15783,5 @@ "preferencias de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15700,9 +15789,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Permitir varias capas apiladas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -15710,115 +15799,120 @@ "transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Dibuxa un rectángulo arredort dos datos descargados do servidor WMS" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Resolución da Imaxe:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Alta resolución(1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Media resolución (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Baixa resolución(600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Interpolación do filtro de imaxe:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilinear (rapido)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bicúbico (lento)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -15826,5 +15920,5 @@ "tamaño" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15832,5 +15926,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16223,4 +16317,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Descargar obxeto..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Descargar todos os membros das relacións escollidas" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Descargar agora" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Por favor, selecciona polo menos unha tarefa para descargar" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Estilo de pintura {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16310,5 +16439,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16391,5 +16520,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Actualizar" @@ -16936,30 +17065,31 @@ msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Por favor escolle 4 vias que formen unha relacuión pechada" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Non se puido ordenar as vias,Por favor verifica a suas direccións" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "Non foi posible atopar nodos de vias. Por favor revise a sua selección" @@ -17073,13 +17203,13 @@ msgstr "Cola" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "desconectado" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "en liña" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17582,9 +17712,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17627,5 +17752,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17653,10 +17778,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18627,20 +18752,20 @@ msgctxt "keyboard-modifiers" msgid "Shift" -msgstr "" +msgstr "Shift" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:80 msgctxt "keyboard-modifiers" msgid "Ctrl" -msgstr "" +msgstr "Ctrl" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:82 msgctxt "keyboard-modifiers" msgid "Alt" -msgstr "" +msgstr "Alt" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:85 msgctxt "keyboard-modifiers" msgid "Meta" -msgstr "" +msgstr "Meta" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29 @@ -18655,17 +18780,17 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37 msgid "Delete ''from''" -msgstr "" +msgstr "Borrar \"de\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38 msgid "Removes the member with role ''from''" -msgstr "" +msgstr "Borrrar o membro con papel \"de\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47 msgid "Delete ''to''" -msgstr "" +msgstr "Borrar \"a\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48 msgid "Removes the member with role ''to''" -msgstr "" +msgstr "Borrar o membro con papel \"a\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57 @@ -18677,5 +18802,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:80 msgid "Fix in editor" -msgstr "" +msgstr "Arranxar no editor" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58 @@ -18683,4 +18808,5 @@ "Go to Basic Editor and manually choose members with roles ''from'' and ''to''" msgstr "" +"Ir ao editor básico e manualmente escolle membros con papeis \"de\" e \"a\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27 @@ -18691,4 +18817,7 @@ "only. Please select one in the Basic editor." msgstr "" +"Este xiro usa unha restricción non estándard do tipo {0} para a " +"etiqueta restricción. É recomendable usar só valores estándard. Por " +"favor escolle un no editor básico." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:36 @@ -18696,4 +18825,5 @@ msgid "Go to Basic Editor and manually choose a turn restriction type" msgstr "" +"Ir ao editor básico e escoller manualmente un tipo de restricción de xiro" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37 @@ -18707,4 +18837,10 @@ "object." msgstr "" +"A from-via {0} e a " +"to-via {1} intersecanse " +"no nodo {2} pero {2}non évía-obxxecto.
É recomendable poñer " +"{2} como única via-" +"obxecto." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49 @@ -18727,28 +18863,30 @@ "type in the Basic Editor." msgstr "" +"Unha restricción de xiro debe declarar o tipo de restricción. Por favor " +"escolle un tipo no Editor Básico." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36 msgid "An OSM way with role from is required in a turn restriction." -msgstr "" +msgstr "Requírese unha vía co papel de nunha restricción de xiro." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39 msgid "An OSM way with role to is required in a turn restriction." -msgstr "" +msgstr "Requírese unha vía co papel a nunha restricción de xiro." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42 msgid "Please go to the Basic editor and manually choose an OSM way." -msgstr "" +msgstr "Por favor, escolla manualmente unha vía OSM no Editor Básico." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48 msgid "Add in editor" -msgstr "" +msgstr "Engadir no editor" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51 msgid "Add an OSM way with role ''from''" -msgstr "" +msgstr "Engadir unha vía OSM co papel \"de\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54 msgid "Add an OSM way with role ''to''" -msgstr "" +msgstr "Engadir unha vía OSM co papel \"a\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37 @@ -18768,5 +18906,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57 msgid "Go to the Advanced Editor and remove the members" -msgstr "" +msgstr "Ir ao Editor Avanzado e borra os membros" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25 @@ -18780,13 +18918,15 @@ msgid "Go to Basic Editor and select standard vehicle type based exceptions" msgstr "" +"Ir ao Editor Básico e escolle as excepcións basadas no tipo de vehículo " +"estándares." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37 #, java-format msgid "The required tag {0}={1} is missing." -msgstr "" +msgstr "A etiqueta {0}={1} falta." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45 msgid "Add missing tag" -msgstr "" +msgstr "Engadir etiqueta faltante" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46 @@ -18828,60 +18968,60 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57 msgid "An OSM way is required instead." -msgstr "" +msgstr "Unha vía OSM é requerida." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63 msgid "Delete the member from the turn restriction" -msgstr "" +msgstr "Borra o membro da restricción de xiro" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81 msgid "Change to the Basic Editor and select an OSM way" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +msgstr "Cambia ao Editor Básico e escolle unha vía OSM" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +msgstr "Recuperar obxecto..." + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +msgstr "Recuperar obxecto por id" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +msgstr "Escoller se os datos deben ser engadidos en unha nova capa" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +msgstr "Introducir o obxecto que debe ser recuperado" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +msgstr "Recuperar Obxecto" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +msgstr "Recuperar Obxecto" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +msgstr "Comezar a recuperar" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +msgstr "Pecha o diálogo e cancela" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +msgstr "Terase {0}" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" -msgstr "" - -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +msgstr "Buscando {0}" + +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" -msgstr "" +msgstr "Atopado {0}" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42 @@ -18890,13 +19030,13 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86 msgid "Validation errors" -msgstr "" +msgstr "Erros de validación" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97 msgid "No validation errors" -msgstr "" +msgstr "Sen erros de validación" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:174 msgid "Grid" -msgstr "" +msgstr "Rede" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282 @@ -18906,24 +19046,26 @@ " {1}" msgstr "" +"Error iniciando exame {0}:\n" +" {1}" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74 msgid "Use ignore list." -msgstr "" +msgstr "Usar lista de omisións" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:75 msgid "Use the ignore list to suppress warnings." -msgstr "" +msgstr "Usar a lista de omisións para suprimir advertencias" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78 msgid "Use error layer." -msgstr "" +msgstr "Utilizar a capa de errores" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79 msgid "Use the error layer to display problematic elements." -msgstr "" +msgstr "Utilizar a capa de errores para amosar elementos problemáticos." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82 msgid "Show informational level on upload." -msgstr "" +msgstr "Amosa información acerca da subida de datos." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:83 @@ -19113,14 +19255,50 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Borrando nodos duplicados..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Borrando nodos duplicados..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Borrando nodos duplicados..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Borrando nodos duplicados..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Borrando nodos duplicados..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Borrando nodos duplicados..." + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -19273,59 +19451,59 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20185,55 +20363,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Gardar capa WMS nun ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Cargar capa WMS dende ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Erro de Formato de Ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Erro cargando ficheiro" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -20376,398 +20554,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "fronteira" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Incremento" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "liña" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Crear multipoligono" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Rede" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "transporte público" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Restricción" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "ruta" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "lugar" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "Vía acuática" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Actualizar" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20825,11 +20898,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Descargar de OSM ó longo desta pista" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Duplica Vías con un desplazamento" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20838,20 +20917,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20861,10 +20940,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Axuda a vectorizar imaxes WMS." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20872,5 +20951,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20880,22 +20959,24 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" -msgstr "" +msgstr "Non engade ningún xiro á esquerda para conxuntos de 4 ou 5 vías" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." -msgstr "" +msgstr "Coinvirte de forma sinxela un área a un multipolígono." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " "relation editor." msgstr "" +"Crea multipolígonos mediante un só clic, moito máis facil que a forma " +"estándar co editor de relacións." #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20903,64 +20984,79 @@ "mouse moving (general Java - tablet problem)." msgstr "" +"Simula un clic cando fas un pequeno e corto arrastre de rato. Isto é util " +"para punteros de tabletas dixitalizadoras, cando teñas problemas simplemente " +"fai clic na tableta dixitalizadota sin mover o rato(xeral Java- tablet " +"Problem)..." #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" -msgstr "" +msgstr "Amosa unha imaxe OpenLayer de fondo" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" +"Importa de OpenStreetBugs posibles erros encontrados polos usuarios de OSM" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" msgstr "" +"Premite abrir arquivos gpx/osm que intersecan coa area visible actualmente" #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." msgstr "" +"Abre o Firefox e amosa a cartografía visible actualmente como unha bonita " +"imaxe SVG." #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " "right click menu of the image layer." msgstr "" +"Agrega información sobre a posición GPS na cabeceirta do arquivo de imaxe. " +"Acceda a esta característica premendo o botón dereito do rato sobre a capa " +"da imaxe." #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " "align it with the map." msgstr "" +"Este complemento permite amosar calquer imaxe como fondo no editor e aliñala " +"co mapa." #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." -msgstr "" +msgstr "O gran JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." msgstr "" +"Este complemento simplifica o cartografiado e edición de rutas de transporte " +"públicos." #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Permitir outras aplicacións enviar ordes a JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Complemento para desfacer conxuntos de cambios" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20968,7 +21064,11 @@ "properties window. Available country presets: Germany." msgstr "" +"Plugin para o eiquetado de obxectos en función de unha selección de sinais " +"de tráfico. O diálogo podese abrir premendo no pequeno icono da esquina " +"superior dereita da ventá de propiedades. País dispoñible dos predefinidos: " +"Alemaña." #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20980,34 +21080,41 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamento." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " "constrained by maximum removed area size. Also average nearby nodes." msgstr "" +"Simplifica áreas mediante a eliminación de nodos en ángulos moi obtusos. " +"Isto pode condicionarse ao tamaño da área máxima a eliminar. Fai ademais un " +"promedio dos nodos próximos." #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " "background and request updates." msgstr "" +"Amosa unha malla do mapa desplazable en JOSM. Poide cargar teselas dende o " +"mapa desplazable e solicitar actualizacións." #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permite engadir marcadores/nodos ás posicións GPS actuais." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" +"Proporcionaa un cadro de diálogo para a edición de etiquetas en unha malla " +"tabular." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21015,26 +21122,33 @@ "the jar-file as standalone as well." msgstr "" +"Engade unha etiqueta predefinida de proba para o menú de axuda que lle " +"facilita o desnevolver o etiquetado de predefinidos (vista previa rápida do " +"diálogo que aparecerá). Tamén pode iniciar o arquivo jar de forma autónoma." #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." -msgstr "" +msgstr "Crea edificion entre medianeras a partires de bloques únicos" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " "Currently adds only one button to slip the map." msgstr "" +"Provee botóns auxiliares para permitir traballar con ratos de un único botón " +"(stylus). Actualmente engade unicamente un botón ao mapa desplazable" #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " "to be running." msgstr "" +"Traza edificios a partir do mapa catastral checo. Require TracerServer (.NET " +"o Mono) para funcionar." #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21045,10 +21159,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "Permite desfacer o borrado de obxetos da base de datos de OSM" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21059,5 +21173,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21067,5 +21181,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21076,5 +21190,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -21082,10 +21196,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" -msgstr "" +msgstr "Escolle unha secuencia de vías conectadas non ramificadas" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21096,8 +21210,10 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." msgstr "" +"Amosa imaxes xeorreferenciadas como fondo en JOSM (servidores WMS, Yahoo, " +"etc.)" #. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "ruta" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "fronteira" + #. color deprecated #. @@ -33570,4 +33863,7 @@ msgstr "Sicilia - Italia" +#~ msgid "closedway" +#~ msgstr "vía pechada" + #~ msgid "Do not show again" #~ msgstr "Non amosar de novo" @@ -33933,7 +34229,4 @@ #~ msgid "All the ways were empty" #~ msgstr "Todas as vías están vacías" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Por favor, selecciona polo menos unha tarefa para descargar" #~ msgid "Can only edit help pages from JOSM Online Help" Index: applications/editors/josm/i18n/po/he.po =================================================================== --- applications/editors/josm/i18n/po/he.po (revision 22464) +++ applications/editors/josm/i18n/po/he.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 17:31+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 20:39+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Hebrew \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "עזרה" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "הפרמטר \"downloadgps\" אינו מקבל שמות קובץ או כתובות URL של קבצים" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -232,8 +232,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -243,13 +243,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -265,5 +266,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -272,5 +273,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -287,13 +289,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "ביטול" @@ -352,11 +354,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -403,6 +405,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -430,5 +433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -552,5 +555,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -610,6 +613,6 @@ msgstr "נא בחר לפחות שתי דרכים לשילוב." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -618,9 +621,9 @@ msgstr "העתק" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "העתק את הפריטים הנבחרים אל חוצץ ההדבקה." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "אנא בחר דבר מה להעתקה." @@ -654,6 +657,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -722,5 +725,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "שכבה נפרדת" @@ -740,5 +743,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "סוג עצם:" @@ -749,5 +752,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "" @@ -792,5 +795,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "שכפל" @@ -938,25 +941,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "חבר אזורים חופפים" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -964,33 +967,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "הזן ערכים לכל ההתנגשויות." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "" @@ -1009,5 +1012,5 @@ msgstr "צרף צומת וקו" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "ללא קיצור" @@ -1352,6 +1355,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1362,17 +1365,17 @@ msgstr "הדבק" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "הדבק את תכני חוצץ ההדבקה." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1381,14 +1384,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "הדבק תגיות" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "החל תגיות של תוכן מחוצץ ההדבקה על כל הפריטים הנבחרים." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1397,5 +1400,5 @@ msgstr[1] "מדביק תגים {0}" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1464,5 +1467,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1473,12 +1476,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1505,6 +1508,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "שגיאה" @@ -1532,5 +1535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "שמירה" @@ -1936,4 +1939,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "" @@ -2401,4 +2405,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2704,5 +2709,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "" @@ -2900,5 +2905,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2919,9 +2924,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "אישור" @@ -3022,5 +3027,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3113,5 +3118,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3124,5 +3129,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3306,11 +3311,42 @@ msgstr "מאפיינים של ‏ " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "תיקון תוויות אוטומטי" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "שגיאה ביצירת ספריית מטמון: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3512,5 +3548,5 @@ msgstr "מזרח" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3518,5 +3554,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3556,5 +3592,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3595,6 +3631,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3606,5 +3641,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3616,7 +3650,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3834,7 +3867,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3842,29 +3875,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "לא גמור" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "כביש ראשי" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "מסילת רכבת" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "נתיב מים" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "" @@ -3872,7 +3905,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3884,5 +3917,5 @@ msgstr[1] "{0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3941,6 +3974,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3948,6 +3981,6 @@ msgstr "בניין" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3956,5 +3989,5 @@ msgstr[1] "{0} חברים" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4029,5 +4062,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4128,69 +4161,69 @@ msgstr "סיסמא" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "שימוש" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "אפשרויות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "הצג עזרה זו" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +msgid "Standard unix geometry argument" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" +msgid "Download the bounding box" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 -msgid "Download the bounding box" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "בחר עם החיפוש הנתון" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +msgid "Launch in maximized mode" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Reset the preferences to default" msgstr "אפס את המאפיינים לברירת מחדל" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4200,9 +4233,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "דוגמאות" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4210,46 +4243,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "מאתחל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "טען תוספים מוקדמים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "קביעת ברירות מחדל" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "יוצר ממשקי גרפי ראשי" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "טעינת תוספים" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "פתור" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "קובץ" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4268,10 +4317,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4279,10 +4328,11 @@ msgstr "כלים" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4293,5 +4343,5 @@ msgstr "תפריט: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "שמע" @@ -4558,5 +4608,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4574,5 +4624,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4785,5 +4835,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "מעלה" @@ -5000,6 +5050,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5014,6 +5064,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5074,17 +5124,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5155,20 +5205,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5177,5 +5229,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5187,5 +5239,5 @@ msgstr[1] "{0} דרכים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5251,5 +5303,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5353,5 +5405,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5753,5 +5805,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5834,5 +5886,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6034,5 +6086,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6885,5 +6937,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7453,5 +7505,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<שונה>" @@ -7582,5 +7634,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7637,26 +7689,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7665,14 +7717,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7682,9 +7734,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7694,15 +7746,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7710,5 +7762,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7716,20 +7768,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7738,64 +7790,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7804,23 +7856,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7829,5 +7881,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7836,50 +7888,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7888,26 +7940,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8241,5 +8299,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9668,12 +9726,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "הורד הכל עם:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9681,8 +9743,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "שטח מירבי לבקשה" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9706,4 +9770,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10143,10 +10208,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10155,5 +10220,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12322,5 +12387,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12329,53 +12394,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "עוד מידע על הכלי הזה" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "מאפייני רשות:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "סוג לא ידוע: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12385,15 +12446,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "שגיאה בניתוח {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12403,18 +12464,18 @@ msgstr[1] "שנה {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "כלום לא נבחר!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "שנה תכונות" @@ -12429,4 +12490,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "חפש: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "חיפוש אחר פריטים." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "התאם מיקוד לבחירה" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "חפש: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13128,5 +13213,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13138,10 +13223,10 @@ msgstr "קבצי שרת OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13150,5 +13235,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13867,11 +13952,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13880,16 +13965,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13898,5 +13983,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14157,5 +14242,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14875,14 +14960,14 @@ msgstr "מבנים" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14914,5 +14999,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -14969,5 +15054,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -14975,5 +15060,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -14982,5 +15067,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "בחר מ..." @@ -14988,17 +15073,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15007,13 +15092,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15038,13 +15123,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15100,5 +15189,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15109,13 +15198,13 @@ msgstr "מים" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15163,5 +15252,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15169,26 +15258,26 @@ msgstr "כתובת" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15200,18 +15289,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "מקור" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15219,5 +15308,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15225,127 +15314,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15353,5 +15447,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15742,4 +15836,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "מיקום ההורדה" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "הורד נתוני מפה משרת ה-OSM." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "הורדת איזור" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "אנא בחר לפחות משימה אחת להורדה" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "שגיאה בניתוח {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15829,5 +15958,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15910,5 +16039,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "רענן" @@ -16454,30 +16583,31 @@ msgstr "מדידות" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16589,13 +16719,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17100,9 +17230,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17145,5 +17270,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17171,10 +17296,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18354,47 +18479,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18629,14 +18754,50 @@ msgstr "דרכים חוצות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "נקודות כפולות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "נקודות כפולות" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "נקודות כפולות" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "נקודות כפולות" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "נקודות כפולות" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "נקודות כפולות" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "נקודות כפולות" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18789,59 +18950,59 @@ msgstr "דרכים חופפות" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19700,55 +19861,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "הורד משטחים גלויים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "שנה רזולוציה" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "טען מחדש משטחים פגומים" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "שמור שכבת WMS לקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "טען שכבת WMS מקובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "שגיאה בפורמט קובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "שגיאה בטעינת קובץ" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19891,398 +20052,292 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "גבול" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "מדידות" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "צינור" + +#. relation type +#: build/specialmessages.java:21 +msgctxt "Relation type" msgid "multipolygon" msgstr "" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "יצירת אומנות" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "מפות תחבורה ציבורית" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "תיאור" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +msgstr "אמת" + +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "הדבק" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "נתיב מים" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "עדכן" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20339,11 +20394,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "מוריד מידע של OSM..." + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20352,20 +20413,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20375,10 +20436,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20386,5 +20447,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20394,15 +20455,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20411,5 +20472,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20419,15 +20480,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20435,5 +20496,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20441,5 +20502,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20448,5 +20509,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20455,10 +20516,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20466,15 +20527,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20484,5 +20545,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20491,10 +20552,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20503,5 +20564,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20510,15 +20571,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20528,10 +20589,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20540,5 +20601,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20547,5 +20608,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20554,10 +20615,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20566,5 +20627,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20574,5 +20635,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20581,15 +20642,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20598,5 +20659,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27191,8 +27252,11 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "צינור" #: build/trans_presets.java:2452 +msgctxt "Power Line" msgid "minor_line" msgstr "" @@ -32556,4 +32620,177 @@ msgstr "חוף" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "גבול" + #. color deprecated #. @@ -33184,7 +33421,4 @@ #~ msgstr "כל הדרכים היו ריקות" -#~ msgid "Please select at least one task to download" -#~ msgstr "אנא בחר לפחות משימה אחת להורדה" - #~ msgid "Can only edit help pages from JOSM Online Help" #~ msgstr "ניתן לערוך דפי עזרה מהעזרה המקוונת של JOSM בלבד" @@ -33281,7 +33515,4 @@ #~ msgid "to" #~ msgstr "אל" - -#~ msgid "Download Area" -#~ msgstr "הורדת איזור" #~ msgid "Edit Properties" @@ -33365,7 +33596,4 @@ #~ msgid "false" #~ msgstr "שקר" - -#~ msgid "true" -#~ msgstr "אמת" #~ msgid "Split way segment" Index: applications/editors/josm/i18n/po/is.po =================================================================== --- applications/editors/josm/i18n/po/is.po (revision 22464) +++ applications/editors/josm/i18n/po/is.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 16:37+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 20: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: 2010-07-11 18:50+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Hjálp" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -228,8 +228,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -239,13 +239,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -261,5 +262,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -268,5 +269,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -283,13 +285,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Hætta við" @@ -349,11 +351,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -400,6 +402,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -427,5 +430,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -549,5 +552,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -611,6 +614,6 @@ msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -619,9 +622,9 @@ msgstr "Afrita" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Afrita valda hluti á klemmuborðið." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Veldu eithvað til að afrita" @@ -654,6 +657,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -722,5 +725,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Aðskilið lag" @@ -740,5 +743,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "" @@ -749,5 +752,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "" @@ -792,5 +795,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Tvöfalda" @@ -938,25 +941,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -964,33 +967,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Leysa árekstra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "" @@ -1009,5 +1012,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "" @@ -1352,6 +1355,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1362,17 +1365,17 @@ msgstr "Líma" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Líma innihald klemmuborðsins." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1381,14 +1384,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Líma eigindi" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Líma eigindi hluta á klemmuborðinu á alla valda hluti." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1397,5 +1400,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1464,5 +1467,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1473,12 +1476,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1505,6 +1508,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Villa" @@ -1532,5 +1535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Vista" @@ -1943,4 +1946,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "" @@ -2404,4 +2408,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2711,5 +2716,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "" @@ -2906,5 +2911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2925,9 +2930,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "Í lagi" @@ -3028,5 +3033,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3119,5 +3124,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3131,5 +3136,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3313,10 +3318,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" msgstr "" @@ -3519,5 +3555,5 @@ msgstr "A" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3525,5 +3561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3563,5 +3599,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3602,6 +3638,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3613,5 +3648,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3623,7 +3657,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3841,7 +3874,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3849,29 +3882,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "óklárað" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 -msgid "highway" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +msgid "highway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vatnsfarvegur" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "" @@ -3879,7 +3912,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3891,5 +3924,5 @@ msgstr[1] "{0} hnútar" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3948,6 +3981,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3955,6 +3988,6 @@ msgstr "bygging" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3963,5 +3996,5 @@ msgstr[1] "{0} stök" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4036,5 +4069,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4129,69 +4162,69 @@ msgstr "Lykilorð" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 +msgid "options" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 -msgid "options" +msgid "Show this help" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 -msgid "Show this help" +msgid "Standard unix geometry argument" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" +msgid "Download the bounding box" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 -msgid "Download the bounding box" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 -msgid "Select with the given search" +msgid "Launch in maximized mode" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" +msgid "Reset the preferences to default" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 -msgid "Reset the preferences to default" +msgid "Set the language" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4201,9 +4234,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4211,46 +4244,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Upphafsstilli" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Bý til aðal notandaviðmót" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Hleð inn viðbótum" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Leysa" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Skrá" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4269,10 +4318,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Sýn" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4280,10 +4329,11 @@ msgstr "Tól" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Forstillingar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4294,5 +4344,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Hljóð" @@ -4559,5 +4609,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4575,5 +4625,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4778,5 +4828,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "" @@ -4993,6 +5043,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5007,6 +5057,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5067,17 +5117,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5148,20 +5198,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5170,5 +5222,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5180,5 +5232,5 @@ msgstr[1] "{0} vegir" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5244,5 +5296,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5346,5 +5398,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5746,5 +5798,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" @@ -5827,5 +5879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6029,5 +6081,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6880,5 +6932,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7448,5 +7500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7577,5 +7629,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7634,26 +7686,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Stök og tögg þeirra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Yfirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Undirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7662,14 +7714,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7682,9 +7734,9 @@ "þennan hlut?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Mörg stök benda á sama hlutinn" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7694,15 +7746,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7710,5 +7762,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7716,20 +7768,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7738,64 +7790,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Bæta völdum stökum á vallistann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Raða stöknum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Raða" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Færa valda meðlimi upp" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Færa valda meðlimi niður" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Fjarlægja völd stök úr þessum venslum" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7804,23 +7856,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7829,5 +7881,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7836,50 +7888,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Bæta við tómu taggi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Niðurhala meðlimum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Vistar hlutverk fyrir völd stök" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Vista hlutverk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7888,27 +7940,33 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Breyta venslunum sem valið stak bendir á" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8242,5 +8300,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9673,12 +9731,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9686,8 +9748,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9711,4 +9775,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10140,10 +10205,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10152,5 +10217,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12320,5 +12385,5 @@ msgstr "Bæta við nýju taggi" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12327,53 +12392,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Frekari upplýsingar um þessa forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Valfrjáls eigind:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12383,15 +12444,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12401,18 +12462,18 @@ msgstr[1] "Breyta {0} hlutum" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Breyta eigindum" @@ -12427,4 +12488,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Leita: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Leita að hlutum." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Þysja að vali" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Leita: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13124,5 +13209,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13134,10 +13219,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13146,5 +13231,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13864,11 +13949,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13877,16 +13962,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13895,5 +13980,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14154,5 +14239,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14872,14 +14957,14 @@ msgstr "Byggingar" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14911,5 +14996,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -14966,5 +15051,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -14972,5 +15057,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -14979,5 +15064,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -14985,17 +15070,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15004,13 +15089,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15035,13 +15120,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15097,5 +15186,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15106,13 +15195,13 @@ msgstr "vatn" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15160,5 +15249,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15166,26 +15255,26 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15197,18 +15286,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15216,5 +15305,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15222,127 +15311,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15350,5 +15444,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15739,4 +15833,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Opna slóð" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Niðurhala kortagögnum frá OSM þjóninum." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Niðurhalssvæði" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Veldu minnst tvo hnúta til að sameina." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Les {0}..." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15826,5 +15955,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15907,5 +16036,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Uppfæra" @@ -16448,30 +16577,31 @@ msgstr "Mælingar" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16583,13 +16713,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17091,9 +17221,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17136,5 +17261,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17162,10 +17287,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18345,47 +18470,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18618,14 +18743,50 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Hnútur endurtekinn í vegi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Hnútur endurtekinn í vegi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Hnútur endurtekinn í vegi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Hnútur endurtekinn í vegi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Hnútur endurtekinn í vegi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Hnútur endurtekinn í vegi" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18778,59 +18939,59 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19687,55 +19848,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Niðurhala sýnilega reiti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Breyta upplausn" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Hlaða reiti sem innihalda villur" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Vista WMS lag í skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Hlaða WMS lag úr skrá" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19876,398 +20037,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 -msgid "boundary" +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" msgstr "" #. relation type #: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" +msgid "boundary" +msgstr "Annars stigs vegur" + +#. relation type +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Mælingar" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Leiðsla" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Marghyrningur" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Listaverk" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "Almenningssamgöngur" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Beygjutakmörkun" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +msgstr "Athugasemd" + +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Líma" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vatnsfarvegur" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Uppfæra" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20324,11 +20380,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Hala niður OSM gögnum..." + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20337,20 +20399,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20360,10 +20422,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20371,5 +20433,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20379,15 +20441,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20396,5 +20458,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20404,15 +20466,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20420,5 +20482,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20426,5 +20488,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20433,5 +20495,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20440,10 +20502,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20451,15 +20513,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20469,5 +20531,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20476,10 +20538,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20488,5 +20550,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20495,15 +20557,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20513,10 +20575,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20525,5 +20587,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20532,5 +20594,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20539,10 +20601,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20551,5 +20613,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20559,5 +20621,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20566,15 +20628,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20583,5 +20645,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27176,10 +27238,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Leiðsla" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "tengibraut á hraðbraut" #. item "Man Made/Power Line" combo "Voltage" @@ -32541,4 +32607,177 @@ msgstr "strönd" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "" + #. color deprecated #. @@ -33272,7 +33511,4 @@ #~ msgstr "þysja" -#~ msgid "Download Area" -#~ msgstr "Niðurhalssvæði" - #~ msgid "Validate either current selection or complete dataset." #~ msgstr "Athuga núverandi val eða öll gögn í laginu." Index: applications/editors/josm/i18n/po/it.po =================================================================== --- applications/editors/josm/i18n/po/it.po (revision 22464) +++ applications/editors/josm/i18n/po/it.po (revision 22465) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-09 13:59+0000\n" -"Last-Translator: Davide Prade \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-22 02:44+0000\n" +"Last-Translator: berserkhc \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -20,11 +20,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Aiuto" @@ -37,5 +37,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -68,7 +68,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -101,5 +101,5 @@ "Il parametro \"downloadgps\" non accetta nomi di file o indirizzi URL di file" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -119,6 +119,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -234,8 +234,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -245,13 +245,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -267,5 +268,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -274,5 +275,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -289,13 +291,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Annulla" @@ -355,11 +357,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -406,6 +408,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -433,5 +436,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -556,5 +559,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -618,6 +621,6 @@ msgstr "Selezionare almeno due percorsi da unire." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -626,9 +629,9 @@ msgstr "Copia" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Copia gli oggetti selezionati all''interno del buffer" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Seleziona qualcosa da copiare." @@ -663,6 +666,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -731,5 +734,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Livello separato" @@ -751,5 +754,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Tipo oggetto:" @@ -760,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID oggetto:" @@ -806,5 +809,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplica" @@ -958,25 +961,25 @@ "modifica." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Nodo aggiunto su tutte le intersezioni" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Correggi le relazioni" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "L''area auto-sovrapposta è stata unita" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Le aree sovrapposte sono state unite" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -986,33 +989,33 @@ "favore verifica che non siano stati introdotti errori." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Inserire dei valori per tutti i conflitti." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Risolvi conflitti" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Correggi i conflitti di etichette" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Sono stati rimossi elementi dalle Relazioni" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Unisi Aree: Elimina le way corte" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Strada chiusa (anello)" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Rimuovi i tag dalle way interne" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Funzione di unione delle Aree" @@ -1031,5 +1034,5 @@ msgstr "Unisci il nodo e il percorso" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Nessuna scorciatoia" @@ -1400,6 +1403,6 @@ "Si prega di selezionare dei percorsi con angoli di 90 o 180 gradi circa." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1410,17 +1413,17 @@ msgstr "Incolla" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Incolla il contenuto memorizzato" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Eliminare i membri incompleti?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Incolla senza i membri incompleti" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1432,14 +1435,14 @@ "primitive incomplete?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Incolla le etichette" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Applica le etichette memorizzate a tutti gli elementi selezionati" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1448,5 +1451,5 @@ msgstr[1] "Incollo le etichette {0}" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1515,5 +1518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1524,12 +1527,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1556,6 +1559,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Errore" @@ -1583,5 +1586,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Salva" @@ -2011,4 +2014,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Scarica dati" @@ -2510,4 +2514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2851,5 +2856,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filtro" @@ -3069,5 +3074,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3088,9 +3093,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3193,5 +3198,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Doppio conflitto" @@ -3290,5 +3295,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3302,5 +3307,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Conferma di cancellazione" @@ -3492,11 +3497,42 @@ msgstr "Proprietà di " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Regole nelle relazioni a cui si riferiscono" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Correzione automatica etichette" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Elimina il file della vecchia estensione {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Errore nella creazione della cartella di cache: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3728,5 +3764,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3736,5 +3772,5 @@ "incluso" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3778,5 +3814,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3822,6 +3858,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3833,5 +3868,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3843,7 +3877,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4069,7 +4102,7 @@ msgstr "Non visualizzare nuovamente (ricorda la scelta)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4077,29 +4110,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "strada" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "ferrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "corso d''acqua" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "tipologia di area" @@ -4107,7 +4140,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4119,5 +4152,5 @@ msgstr[1] "{0} nodi" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "trasporto pubblico" @@ -4176,6 +4209,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4183,6 +4216,6 @@ msgstr "building" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4191,5 +4224,5 @@ msgstr[1] "{0} membri" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4264,5 +4297,5 @@ msgstr "Oggetto eliminato" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4346,5 +4379,5 @@ msgstr "" "Aggiungi ognuno alla selezione iniziale. Può essere una stringa di ricerca " -"simile a quelel di Google o un URL che restituisce osm-xml" +"simile a quelle di Google o un URL che restituisce osm-xml" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62 @@ -4366,39 +4399,39 @@ msgstr "Password" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "opzioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Mostra questo aiuto" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Scarica la zona delimitata dal riquadro di selezione" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" +"Apre un file (qualunque tipo di file che possa essere aperto con File/Apri)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" -"Apre un file (qualunque tipo di file che possa essere aperto con File/Apri)" +msgid "Download the bounding box as raw gps" +msgstr "" +"Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" -msgstr "" -"Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" @@ -4406,33 +4439,33 @@ "gps grezzi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Seleziona i risultati della ricerca della stringa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Lancia in modalità massimizzata" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Reimposta le preferenze predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Imposta la lingua" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "opzioni fornite come proprietà di sistema Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Cambia la cartella per tutte le impostazioni utente" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4446,9 +4479,9 @@ "allocata (in megabyte)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "Esempi" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4458,38 +4491,54 @@ "questo ordine." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" "Assicurarsi di caricare qualche dato se si utilizza il parametro --selection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Inizializzazione" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Aggiornando plugins..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Installando plugins aggiornati" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Caricamento vecchie estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Impostazioni predefinite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Creazione dell''interfaccia principale" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Caricamento estensioni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Risolvi" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4498,9 +4547,9 @@ "più usata." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "File" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4519,10 +4568,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4530,10 +4579,11 @@ msgstr "Strumenti" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Preimpostati" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4544,5 +4594,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4829,5 +4879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4845,5 +4895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5075,5 +5125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Su" @@ -5306,6 +5356,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5320,6 +5370,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5384,17 +5434,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Annulla la risoluzione del conflitto" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Applica i conflitti risolti" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5469,20 +5519,22 @@ msgstr "Conflitti nelle etichette incollate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Incolla ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Da ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "A ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5491,5 +5543,5 @@ msgstr[1] "{0} etichette" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5501,5 +5553,5 @@ msgstr[1] "{0} percorsi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5570,5 +5622,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Valore:" @@ -5696,5 +5748,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Dettagli" @@ -6114,5 +6166,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -6197,5 +6249,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6412,5 +6464,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Apri" @@ -7270,5 +7322,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7900,5 +7952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -8031,5 +8083,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8090,26 +8142,26 @@ msgstr "({0}/{1}): Scaricamento relazione ''''{2}''''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Etichette e Membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relazioni da cui dipende" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relazioni figlie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Applica ruolo:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Inserire un ruolo e applicarlo ai membri della relazione selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8122,14 +8174,14 @@ "circolari?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Rimuovili, ripulisci la relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorali, mantieni la relazione com'è" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8142,9 +8194,9 @@ "aggiungere un altro membro alla relazione?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Più membri fanno riferimento alla stessa primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8157,5 +8209,5 @@ "''''{0}'''' omessa." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8164,5 +8216,5 @@ "del primo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8171,5 +8223,5 @@ "l''ultimo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8179,5 +8231,5 @@ "del primo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8187,5 +8239,5 @@ "l''ultimo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -8193,10 +8245,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor delle relazioni: Rimuovi selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8205,5 +8257,5 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8214,64 +8266,64 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Seleziona le primitive per i membri della relazione selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Ordina i membri della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor delle relazioni: Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Inverti l''ordine dei membri della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Inverti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor delle relazioni: Inverti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Sposta in alto i membri attualmente selezionati" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor delle relazioni: Sposta in alto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Sposta in basso i membri attualmente selezionati" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor delle relazioni: Sposta in basso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Rimuovi i membri correntemente selezionati da questa relazione" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor delle relazioni: Rimuovi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Elimina la relazione correntemente modificata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8283,24 +8335,24 @@ "era aperto. Sono stati rimossi dalla lista dei membri." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Si, crea un conflitto e chiudi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" "Cliccare per creare un conflitto e chiudere questo editor delle relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "No, continua la modifica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Cliccare per ritornare alla modifica della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8312,5 +8364,5 @@ "desidera creare un conflitto e chiudere l''editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8322,50 +8374,50 @@ "riprovare." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Applica gli aggiornamenti correnti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Applica gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Annulla gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Aggiungi una etichetta vuota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Scarica tutti i membri incompleti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor delle relazioni: Scarica membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Scarica i membri incompleti selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Imposta un ruolo ai membri selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Applica Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8374,29 +8426,35 @@ msgstr[1] "Si sta impostando un ruolo vuoto su {0} primitive." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Questo equivale all''eliminazione dei ruoli di queste primitive." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Si desidera veramente applicare il nuovo ruolo?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Si, applica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "No, non applicare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Conferma ruolo vuoto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "" "Modifica la relazione a cui fa riferimento il membro della relazione " "correntemente selezionato." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8759,5 +8817,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10376,12 +10434,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Scarica da OSM lungo questo tracciato" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Scarica tutto entro:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10389,8 +10451,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Area massima per richiesta:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10414,4 +10478,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10873,10 +10938,10 @@ msgstr[1] "Trovate {0} contenti informazioni GPS." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Elimina il file immagine dal disco" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10887,5 +10952,5 @@ "definitivamente perduto!" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Il file dell''immagine non può essere eliminato." @@ -12138,5 +12203,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50 msgid "Draw Direction Arrows" -msgstr "Disegna le linee di direzione" +msgstr "Disegna le frecce di direzione" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51 @@ -12149,5 +12214,6 @@ msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" -"Solo suggerimenti di direzioni interessanti (es. con etichetta oneway)." +"Solo per suggerimenti di direzione significativi (es. con etichetta di senso " +"unico)." #. only on the head of a way @@ -12155,5 +12221,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238 msgid "Only on the head of a way." -msgstr "Solo sull'estremità di un percorso." +msgstr "Solo sull''estremità di un percorso." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 @@ -12198,10 +12264,10 @@ "draw all lines." msgstr "" -"Massima lunghezza (in metri) per il tracciamento di linee in files locali. " +"Lunghezza massima (in metri) per il tracciamento di linee per i file locali. " "Usare ''-1'' per disegnare qualsiasi linea." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113 msgid "Maximum length for local files (meters)" -msgstr "Massima lunghezza per files locali (metri)" +msgstr "Lunghezza massima per i file locali (metri)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118 @@ -12328,5 +12394,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79 msgid "Show splash screen at startup" -msgstr "Mostra la finestra d'avvio" +msgstr "Mostra la finestra di avvio" #. Show ID in selection @@ -13349,5 +13415,5 @@ msgstr "Aggiungi una nuova etichetta" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -13358,53 +13424,49 @@ "display_values deve essere lo stesso di values" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Ulteriori informazioni su questa caratteristica" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "Requisito sconosciuto: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Ruoli disponibili" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "ruolo" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "conteggio" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "elementi" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Attributi opzionali:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "percorso chiuso" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Tipo sconosciuto: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "Elemento ruolo preimpostato senza genitori" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "Sotto-elemento preimpostato senza genitori" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -13414,15 +13476,15 @@ msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Impossibile leggere {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Sono supportati elementi di tipo {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13432,18 +13494,18 @@ msgstr[1] "Modifica {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -13458,4 +13520,28 @@ msgid "Preset group {0}" msgstr "Gruppo preimpostato {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Cerca: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Cerca oggetti" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Visualizza il nome localizzato nelle liste di selezione" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Cerca: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -14239,5 +14325,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -14249,5 +14335,5 @@ msgstr "Server dei File di OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" @@ -14256,5 +14342,5 @@ "
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -14265,5 +14351,5 @@ "copia di sicurezza.
L''errore è:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -15077,11 +15163,11 @@ msgstr "Scarica la lista delle estensioni..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Scaricamento della lista delle estensioni da ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -15093,16 +15179,16 @@ "''''{1}''''." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Scrittura della lista delle estensioni su file locale ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Analisi della lista delle estensioni dal sito ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -15113,5 +15199,5 @@ "ignorato. L''eccezione è stata: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -15454,5 +15540,5 @@ "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16308,14 +16394,14 @@ msgstr "Edifici" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "Prossimo numero" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Strada" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "Inserisci indirizzo" @@ -16352,5 +16438,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Seleziona Feuille" @@ -16409,5 +16495,5 @@ msgstr "CadastreGrabber: indirizzo url non valido." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -16417,5 +16503,5 @@ "Il server è in manutenzione oppure temporaneamente sovraccaricato." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -16426,5 +16512,5 @@ "oppure azione annullata" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Scegliere da..." @@ -16432,17 +16518,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Seleziona il comune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Sorgente auto-determinata" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -16455,13 +16541,13 @@ "Si desidera ripristinare F11 per l''azione di trascinamento?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Ripristino della scorciatoia F11 di trascinamento" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -16488,18 +16574,22 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Disabilita il ritaglio dell''immagine durante la georeferenziazione." #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Selezionare la tabella di assemblaggio" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "Seleziona il primo livello WMS della lista." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" -"Non utilizzare la relazione per gli indirizzi (bensì \"addr:street\" sui " -"nodi)." +"Non utilizzare una relazione per gli indirizzi (utilizza invece l''etichetta " +"\"addr:street\" sugli elementi)." #. item "Man Made/Pipeline" combo "Type" @@ -16553,5 +16643,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -16562,13 +16652,13 @@ msgstr "acqua" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "simbolo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "particella catastale" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "appezzamento numero" @@ -16616,5 +16706,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -16622,26 +16712,26 @@ msgstr "indirizzo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "località" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "sezione" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "comune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Abilita la cache automatica." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Massima dimensione della cache (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16659,9 +16749,9 @@ "caricamento di dati creati da questa estensione." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS francese del catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -16669,10 +16759,10 @@ "automatica" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Sorgente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16682,5 +16772,5 @@ "preferenze di JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16690,9 +16780,9 @@ "intermedi). Utile per testi su sfondi scuri." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Permette la sovrapposizione di livelli multipli" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16700,116 +16790,121 @@ "trasparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Traccia un rettangolo attorno i dati scaricati dal server WMS." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Risoluzione immagine:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Alta risoluzione (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Media risoluzione (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Bassa risoluzione (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Interpolazione zoom immagine:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Ordine zero (la più veloce) [ Predefinita ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilineare (veloce)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bicubica (lenta)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Moltiplicatore di trascinamento per immagini vettoriali:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Trascina una immagine a pieno schermo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Trascina immagini più piccole (maggiore qualità ma più utilizzo di memoria)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Dimensioni fisse riquadro (predefinito è 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Dimensioni fisse (da 25 a 1000 metri)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Livelli:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "Mari, fiumi, piscine." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Edifici, luoghi chiusi, costruzioni sotto terra." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Simboli, come la croce cristiana." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Particelle catastali." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Numeri delle particelle catastali, nomi delle strade." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Indirizzo, numeri civici." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Località, paese, luogo." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Sezioni e sottosezioni catastali." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Confini comunali." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Moltiplicatore di trascinamento per immagini raster:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Mostra trasversali:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16817,5 +16912,5 @@ "dimensione" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16825,5 +16920,5 @@ "durante l''operazione di cattura." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "Seleziona questo per utilizzare l''etichetta \"add:street\" sui nodi." @@ -17246,4 +17341,39 @@ msgid "TCX Files (*.tcx)" msgstr "File TCX (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Scarica oggetto..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Scarica i dati della mappa alla fine del percorso selezionato" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Scarica adesso" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Selezionare almeno un compito per scaricare" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Controllo {0}/{1}: Inizio {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Errore nella interpretazione di {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -17333,5 +17463,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "Usa script esterni in JOSM" @@ -17414,5 +17544,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Aggiorna" @@ -17977,32 +18107,33 @@ msgstr "Misure" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Divieto di svolta a sinistra Michigan" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" "Aggiunge dei divieti di svolta a sinistra per insiemi di 4 o 5 percorsi." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" "Selezionare 4 o 5 percorsi per assegnare i divieti di svolta a sinistra." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Selezionare 4 percorsi che formano una relazione chiusa." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Impossibile ordinare i percorsi. Verificare le loro direzioni" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Crea divieto di svolta a sinistra Michigan" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -18126,13 +18257,13 @@ msgstr "Coda" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "non in linea" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "in linea" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -18651,9 +18782,4 @@ msgstr "Destinazione dell''unione mancante per {0} con id {1}" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "La destinazione di tipo {0} con id {1} ha una versione non valida" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18700,5 +18826,5 @@ msgstr "Ripristina il gruppo di modifiche #{0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "Plugin segnali stradali" @@ -18726,10 +18852,10 @@ msgstr "Errore nell''analisi delle etichette preimpostate da ''{0}'':\n" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "Segnale stradale {0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -20018,47 +20144,47 @@ msgstr "Posizionati sull''editor di base e seleziona un percorso OSM" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "Ripristina oggetto..." -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "Ripristina oggetto da identificativo" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "Selezionare se i dati devono essere aggiunti in un nuovo livello" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "Inserire l''ID dell''oggetto che dovrebbe essere ripristinato" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "Ripristina Oggetto" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "Ripristina oggetto" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "Inizio ripristino" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "Chiudi la finestra ed annulla" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "Otterrà {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "Ricerca di {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -20300,15 +20426,51 @@ msgstr "Percorsi incrociati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Nodi duplicati" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Questo controllo verifica che non ci siano due nodi nella stessa posizione." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Fondere il nodo duplicato?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Nodi duplicati" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Nodi duplicati" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Fondere il nodo duplicato?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Nodi duplicati" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Fondere il nodo duplicato?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Nodi nella stessa posizione" @@ -20470,59 +20632,59 @@ msgstr "Percorsi sovrapposti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "Validatore di relazioni :" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "Questa estensione cerca gli errori nelle relazioni." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "Tipo di relazione sconosciuto" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "Relazione vuota" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "Ruolo {0} mancante" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "Problema nella verifica del ruolo" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "Numero di ruoli {0} troppo basso ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "Numero di ruoli {0} troppo alto ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "Membro per ruolo {0} di tipo errato" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "Ruolo {0} sconosciuto" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "Trovato ruolo vuoto" @@ -21448,9 +21610,9 @@ msgstr "Indirizzo URL non valido?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Scarica i tasselli visibili" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21459,46 +21621,46 @@ "visuale, oppure di cambiare la risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Cambia risoluzione" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Ricarica i tasselli non corretti" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Salva il livello WMS su file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Salva livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Carica il livello WMS da file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Carica livello WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Errore nel formato del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Errore durante il caricamento del file" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Imposta segnalibro WMS" @@ -21647,231 +21809,127 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "crea una relazione associatedStreet" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "confine" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Incrementa" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "linea" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "multipoligono" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Rete" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "trasporto pubblico" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Divieto" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "itinerario" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "luogo" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "corso d''acqua" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "Tutti i file" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "Attributi" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "Esci schermata selezione file" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "Esci dalla finestra di selezione file." #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "Crea nuova cartella" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "Elimina file" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "Inserisci il nome del file:" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "Inserisci il percorso o il nome della cartella:" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "Errore " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -21879,90 +21937,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "Nome file:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "Nome file:" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "Guida FileChooser." #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "File" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "File di tipo:" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "File di tipo:" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "Filtro:" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "Cartelle" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "Cartella principale" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "Elenco" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "Cerca in:" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "Cerca in:" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "Ultima modifica" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "Nuova cartella" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "Apri il file selezionato" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "Apri file selezionato." #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "Rinomina file" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -21970,75 +22028,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "Salva in:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "Salva in:" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "Salva il file selezionato." #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "Selezione:" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "Dimensione" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "Livello superiore" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "Aggiorna" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "Aggiorna contenuto della cartella." #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "Blu:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "Nome del colore:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "Verde:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "Tonalità:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "Selezione del colore GTK" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "Rosso:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "Saturazione:" @@ -22075,7 +22133,7 @@ "true :-)" msgstr "" -"Permette all''utente di creare schemi cromatici differenti e di passare da " -"uno all''altro. E'' sufficiente cambiare i colori e creare un nuovo schema. " -"E'' usato per passare su uno sfondo bianco con colori abbinati in modo da " +"Permette all'utente di creare schemi cromatici differenti e di passare da " +"uno all'altro. E' sufficiente cambiare i colori e creare un nuovo schema. E' " +"usato per passare su uno sfondo bianco con colori abbinati in modo da " "rendere la visualizzazione migliore sotto la luce del sole. Vedere la " "schermata tra le preferenze di JOSM e le ''Impostazioni della " @@ -22110,20 +22168,26 @@ "dal livello correntemente attivo in JOSM." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Scarica da OSM lungo questo tracciato" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Duplica i percorsi con una differenza" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " "very fast." msgstr "" -"Permette all''utente di rendere anonime le marcature temporali ed eliminare " +"Permette all'utente di rendere anonime le marcature temporali ed eliminare " "velocemente parti di tracciati GPX di grandi dimensioni." #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -22132,5 +22196,5 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" @@ -22138,10 +22202,10 @@ #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Fornisce un livello di sfondo che visualizza una griglia di mappa" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -22149,16 +22213,16 @@ "the filename of an image." msgstr "" -"Un''altra estensione per la correlazione delle immagini ai punti del " +"Un'altra estensione per la correlazione delle immagini ai punti del " "tracciato presenti in un file GPX. Una correlazione avviene quando " -"l''attributo ''name'', ''cmt'' oppure ''desc'' di una etichetta di un punto " -"del percorso corrisponde al nome del file di un''immagine." +"l'attributo ''name'', ''cmt'' oppure ''desc'' di una etichetta di un punto " +"del percorso corrisponde al nome del file di un'immagine." #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Aiuta nella vettorizzazione delle immagini WMS." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -22168,5 +22232,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -22174,21 +22238,21 @@ "paths (which also can be imported from a gps layer)." msgstr "" -"Fornisce una finestra di misurazione e un livello per misurare le lunghezze " -"e gli angoli dei segmenti, nonché l''area inclusa da un percorso chiuso " +"Fornisce una finestra di misurazione ed un livello per misurare le lunghezze " +"e gli angoli dei segmenti, nonché l'area inclusa da un percorso chiuso " "(semplice), e crea dei percorsi di misurazione (che possono essere importati " "da un livello gps)." #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Aggiunge divieti di svolta a sinistra per insiemi di 4 o 5 percorsi" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Converti semplicemente un''area in un multi-poligono." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -22199,5 +22263,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -22205,5 +22269,5 @@ "mouse moving (general Java - tablet problem)." msgstr "" -"Simula un click quando si effettua un piccolo e breve trascinamento. E'' " +"Simula un click quando si effettua un piccolo e breve trascinamento. E' " "utile per le penne dei tablet, quando si hanno dei problemi semplicemente " "cliccando il tablet senza lo spostamento del mouse (in generale un problema " @@ -22211,15 +22275,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Visualizza una immagine di sfondo OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importa le segnalazioni da OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -22229,5 +22293,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -22237,5 +22301,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -22246,5 +22310,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -22255,10 +22319,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Il grande aspetto e stile JGoodies Plastic." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -22268,15 +22332,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Estensione per il ripristino dei gruppi di modifiche" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -22284,11 +22348,11 @@ "properties window. Available country presets: Germany." msgstr "" -"Estensione per l''etichettatura di oggetti basata su una selezione di " -"segnali stradali. La finestra può essere aperta cliccando su una piccola " -"icona posizionata nell''angolo superiore destro del pannello delle " -"proprietà. Paesi per cui le preimpostazioni sono disponibili: Germania." +"Estensione per l'etichettatura di oggetti basata su una selezione di segnali " +"stradali. La finestra può essere aperta cliccando su una piccola icona " +"posizionata nell'angolo superiore destro del pannello delle proprietà. Paesi " +"per cui le preimpostazioni sono disponibili: Germania." #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22300,10 +22364,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Fornisce funzioni di navigazione" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22312,5 +22376,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22321,15 +22385,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22343,10 +22407,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Costruisce un complesso di edifici a partire da singoli blocchi." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22358,5 +22422,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22367,20 +22431,19 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " "restrictions in the OpenStreetMap database." msgstr "" -"L''estensione turnrestrictions permette di inserire e gestire le " -"informazioni inerenti ai divieti di svolta presenti nella base dati di " -"OpenStreetMap." +"L'estensione turnrestrictions permette di inserire e gestire le informazioni " +"inerenti ai divieti di svolta presenti nella base dati di OpenStreetMap." #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "Permette di ripristinare un oggetto dal database di OSM" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22392,5 +22455,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22403,5 +22466,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22413,5 +22476,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -22419,10 +22482,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Seleziona una sequenza di percorsi connessi non ramificati" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22433,5 +22496,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -26301,5 +26364,5 @@ #: build/trans_presets.java:1574 msgid "Terminal" -msgstr "Terminal aeroportuale" +msgstr "Terminale" #. item "Airport/Terminal" @@ -27023,5 +27086,5 @@ #: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" -msgstr "Articoli sportivi" +msgstr "Sport" #. group "Sports" @@ -27585,5 +27648,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "equestrian" -msgstr "sport_equestri" +msgstr "sport equestri" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27724,5 +27787,5 @@ #: build/trans_presets.java:1955 msgid "Sport" -msgstr "Sport" +msgstr "Discipline sportive" #. group "Sport" @@ -27850,5 +27913,5 @@ #: build/trans_presets.java:2182 msgid "pitch" -msgstr "campo_sportivo" +msgstr "campo sportivo" #: build/trans_presets.java:1960 build/trans_presets.java:1966 @@ -27872,5 +27935,5 @@ #: build/trans_presets.java:2182 msgid "sports_centre" -msgstr "centro_sportivo" +msgstr "centro sportivo" #: build/trans_presets.java:1960 build/trans_presets.java:1966 @@ -28101,5 +28164,5 @@ #: build/trans_presets.java:2063 msgid "Sport (Ball)" -msgstr "Sport (palla)" +msgstr "Discipline sportive (palla)" #. group "Sport (Ball)" @@ -29028,8 +29091,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "linea" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "linea minore" @@ -34394,4 +34461,177 @@ msgstr "spiaggia" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "itinerario" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "confine" + #. color deprecated #. @@ -34910,4 +35150,10 @@ msgstr "Sicilia - Italia" +#~ msgid "closedway" +#~ msgstr "percorso chiuso" + +#~ msgid "Target of type {0} with id {1} has invalid version" +#~ msgstr "La destinazione di tipo {0} con id {1} ha una versione non valida" + #~ msgid "No data imported." #~ msgstr "Nessun dato importato." @@ -34918,7 +35164,4 @@ #~ msgid "Refresh the selection list." #~ msgstr "Ricarica la lista di selezione" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Selezionare almeno un compito per scaricare" #~ msgid "Data Layer" @@ -35822,7 +36065,4 @@ #~ "corrente {1}" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Selezionare la tabella di assemblaggio" - #~ msgid "Remove Selected" #~ msgstr "Elimina gli elementi selezionati" @@ -36898,7 +37138,4 @@ #~ msgstr "Ricerca delle traduzioni disponibili..." -#~ msgid "Delete old plugin file {0}" -#~ msgstr "Elimina il file della vecchia estensione {0}" - #~ msgid "Expected value > 0 for parameter ''{0}'', got {1}" #~ msgstr "" Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 22464) +++ applications/editors/josm/i18n/po/ja.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-09 03:08+0000\n" -"Last-Translator: higa4 \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-27 13:46+0000\n" +"Last-Translator: ribbon \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:52+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: JAPAN\n" @@ -26,11 +26,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "ヘルプ" @@ -43,5 +43,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -74,7 +74,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -107,5 +107,5 @@ "パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -238,8 +238,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -249,13 +249,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -271,5 +272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -278,5 +279,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -293,13 +295,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "キャンセル" @@ -362,11 +364,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -413,6 +415,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -440,5 +443,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -562,5 +565,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -621,6 +624,6 @@ msgstr "結合するウェイを少なくとも二つ選択してください。" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -629,9 +632,9 @@ msgstr "コピー" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "選択したオブジェクトをペースト用バッファにコピーします。" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "コピーするものを選択してください。" @@ -666,6 +669,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -734,5 +737,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "新規レイヤーを作成" @@ -752,5 +755,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "オブジェクト種別:" @@ -761,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "オブジェクトID:" @@ -805,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "複製" @@ -951,25 +954,25 @@ msgstr "交差点がみつかりません。何も変更されませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "すべての交差点にノードを追加" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "内側のマルチポリゴンの一部ではないウェイを削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "リレーションの修正" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "結合された自己重複エリア" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "結合されたオーバーラップエリア" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -979,33 +982,33 @@ "確認してください。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "すべての競合に値を入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "競合を解決する" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "タグの競合を修正" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "リレーションから要素を削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "エリアの結合：　短いウェイの削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "閉じたウェイ" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "内部のウェイからタグを削除" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "エリア結合機能" @@ -1024,5 +1027,5 @@ msgstr "ノードと線をつなぐ" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "ショートカットなし" @@ -1380,6 +1383,6 @@ msgstr "角度が約90度または180度のウェイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1390,17 +1393,17 @@ msgstr "貼り付け" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "貼り付けバッファの内容を貼り付け" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "不完全な数字を削除？" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "不完全な数字なしで貼り付け" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1411,15 +1414,15 @@ "リミティブが削除されます。データを不完全なプリミティブ抜きで貼り付けますか？" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "タグの貼り付け" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" "クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1427,5 +1430,5 @@ msgstr[0] "{0} 個のタグを追加しています" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1493,5 +1496,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1502,12 +1505,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1534,6 +1537,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "エラー" @@ -1561,5 +1564,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "保存" @@ -1976,4 +1979,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "データのダウンロード" @@ -2446,4 +2450,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2775,5 +2780,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "フィルター" @@ -2802,5 +2807,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 msgid "Invalid search expression" -msgstr "" +msgstr "不正な検索拡張" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -2851,5 +2856,5 @@ msgctxt "search" msgid "A" -msgstr "" +msgstr "A" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 @@ -2983,5 +2988,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3002,9 +3007,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3106,5 +3111,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "二重の競合" @@ -3193,10 +3198,10 @@ #, java-format msgid "Deleted ''{0}''" -msgstr "" +msgstr "''{0}''を削除" #. leave message in one tr() as there is a grammatical #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3210,5 +3215,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "削除確認" @@ -3394,11 +3399,42 @@ msgstr "プロパティ " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "次を参照する関連中のロール" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "自動タグ修正" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "ディレクトリからファイルを入手中のエラー {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "古いバックアップファイルを上書きますか？" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "キャッシュディレクトリ {0} の作成中にエラーが発生しました." + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3620,5 +3656,5 @@ msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3626,5 +3662,5 @@ msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3667,5 +3703,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3711,6 +3747,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3721,5 +3756,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3730,7 +3764,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3952,7 +3985,7 @@ msgstr "次回から表示しない" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3960,29 +3993,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "不完全" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "道路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "鉄道" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "水路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "土地利用" @@ -3990,7 +4023,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4001,5 +4034,5 @@ msgstr[0] "{0} 個のノード" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "公共輸送機関" @@ -4058,6 +4091,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4065,6 +4098,6 @@ msgstr "建物" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4072,5 +4105,5 @@ msgstr[0] "{0} 個のメンバー" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4145,5 +4178,5 @@ msgstr "オブジェクトは削除されました" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4245,69 +4278,69 @@ msgstr "パスワード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "使用法" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "オプション" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "このヘルプの表示" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "標準のunix配置引数" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "境界囲みをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "bounding boxを生GPSとしてダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "(lat=x&lon=y&zoom=zがついた)URLで示される場所の生gpsをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "検索から選択" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "最大モードで起動" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "設定を既定に戻します。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "言語の設定" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "Javaシステムのプロパティとして提供されるオプション" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "全てのユーザ設定用フォルダを変更" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4320,9 +4353,9 @@ " 使用メモリの最大サイズ（メガバイト単位）を指定することができます。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "例" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4331,46 +4364,62 @@ "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "初期化" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "プラグイン更新中..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "更新されたプラグインをインストール中" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "早期読み込みプラグインのロード中" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "デフォルト設定" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "メインGUIを作成します。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "プラグインのロード" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "解決" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "設定 {0} はもう使われていないので、除かれました。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "ファイル" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4389,10 +4438,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4400,10 +4449,11 @@ msgstr "ツール" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "プリセット" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4414,5 +4464,5 @@ msgstr "メニュー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "音声" @@ -4692,5 +4742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4708,5 +4758,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4921,5 +4971,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "上" @@ -5140,6 +5190,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5154,6 +5204,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5214,17 +5264,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "競合解決をキャンセル" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "解決済み競合を適用" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5295,20 +5345,22 @@ msgstr "貼り付けられたタグの競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "貼り付け ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "元: ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "先: ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5316,5 +5368,5 @@ msgstr[0] "{0} タグ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5325,5 +5377,5 @@ msgstr[0] "{0}ウェイ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5391,5 +5443,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "値:" @@ -5502,5 +5554,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "詳細" @@ -5903,5 +5955,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" @@ -5984,5 +6036,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6190,5 +6242,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Open" @@ -7042,5 +7094,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7634,5 +7686,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<差異あり>" @@ -7761,5 +7813,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7815,26 +7867,26 @@ msgstr "リレーション \"{2}\" をダウンロード中 ({0}/{1})" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "タグとメンバ－" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "親リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "子リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "ロールを入力して選択されたリレーションメンバーに適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7846,14 +7898,14 @@ "参照をどうしますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "削除し、リレーションをクリーンナップ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "無視し、リレーションはそのまま" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7866,9 +7918,9 @@ "か？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "複数のメンバーが同じプリミティブを参照しています" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7880,5 +7932,5 @@ "起こすので薦められません。
リレーション ''{0}'' をスキップします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7886,5 +7938,5 @@ "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7892,5 +7944,5 @@ "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7900,5 +7952,5 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7908,20 +7960,20 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "リレーション編集画面: 削除が選択されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7931,64 +7983,64 @@ "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "選択されたリレーションメンバーのプリミティブを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "リレーションメンバーをソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "並べ替え" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "リレーション編集画面: ソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "リレーションメンバーの表示順序を反転する" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "逆順" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "リレーションエディタ:反転" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "選択したメンバーを1つ上に移動します" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "リレーション編集画面: 上へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "リレーション編集画面: 下へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "このリレーションから選択したメンバーを削除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "リレーション編集画面: 削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "現在編集されたリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8000,23 +8052,23 @@ "それらはリレーションメンバーリストから削除されました。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "はい、競合を作成して閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "クリックして競合を作成し、このリレーションエディタを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "いいえ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8027,5 +8079,5 @@ "集を続けることはできません

競合を作成してエディタを閉じますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8036,50 +8088,50 @@ "最初にこの競合を解決してからやり直してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "現在の更新を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "更新を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "更新をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "空のタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "全ての不完全なメンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "リレーション編集画面: メンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "選択された不完全なメンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "選択されたメンバーにロールをセット" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8087,27 +8139,33 @@ msgstr[0] "{0} プリミティブに空のロールを設定しています。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "これはこれらのプリミティブのロールを削除することと同じです" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "新しいロールを本当に適用しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "はい、適用します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "いいえ、適用しません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "空のロールを確認" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "選択中のリレーションメンバーが参照しているリレーションを編集" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8449,5 +8507,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9971,12 +10029,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "このトラックに沿ってOSMからダウンロード" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "次の範囲内の全てをダウンロード:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9984,8 +10046,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "リクエストあたりの最大面積：" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10009,4 +10073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10450,10 +10515,10 @@ msgstr[0] "GPSタグが必要なものが {0}見つかりました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "ディスクから画像ファイルを削除" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10464,5 +10529,5 @@ "に失われます。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "画像ファイルが削除できません。" @@ -12740,5 +12805,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:64 msgid "multiple" -msgstr "" +msgstr "複数個" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:500 @@ -12756,5 +12821,5 @@ msgstr "新しいタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12765,53 +12830,49 @@ "にあるものと同じでなければなりません" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "この地物の詳細情報" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "不明な必要条件: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "利用可能なロール" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "ロール" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "件数" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "エレメント" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "オプションの属性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "閉じたウェイ" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "不明なタイプ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "親の無いロール要素をプリセット" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "親の無いサブ要素をプリセット" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12821,15 +12882,15 @@ msgstr "タグ付けプリセットのソース {0} を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "走査時にエラー: {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12838,18 +12899,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "選択が適切ではありません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "プリセットの適用" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "プロパティを変更する" @@ -12864,4 +12925,28 @@ msgid "Preset group {0}" msgstr "プリセットグループ {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "検索: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "オブジェクトを検索" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "選択リストにローカライズされた名前を表示" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "検索: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13599,5 +13684,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13609,10 +13694,10 @@ msgstr "OSMサーバファイル" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "保存中にエラー発生。
エラー:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13623,5 +13708,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14380,11 +14465,11 @@ msgstr "プラグインリストをダウンロード..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "''{0}'' からプラグインリストをダウンロード中" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14395,16 +14480,16 @@ "からのプラグインリストをキャッシュできません。" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "ローカルキャッシュ ''{0}'' にプラグインリストを書き込み中" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "サイト ''{0}'' からのプラグインリストをパースしています" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14415,5 +14500,5 @@ "す。例外コード: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14725,5 +14810,5 @@ "は失敗です。

エラーメッセージ:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15380,5 +15465,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51 msgid "Numbers:" -msgstr "" +msgstr "数値:" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19 @@ -15456,5 +15541,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "" +msgstr "住所の追加" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 @@ -15469,16 +15554,16 @@ msgstr "建物" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "ストリート" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" -msgstr "" +msgstr "住所の入力" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15510,5 +15595,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "用紙選択" @@ -15567,5 +15652,5 @@ msgstr "CadastreGrabber: 不正な url." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15575,5 +15660,5 @@ "サーバが保守中か、一時的に過負荷になっています。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15584,5 +15669,5 @@ "又はキャンセルされました。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "選択..." @@ -15590,17 +15675,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "コミューンの選択" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "自動ソーシング" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15612,13 +15697,13 @@ "F11 を取得アクションに戻しますか？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "F11 を取得ショートカットに戻す" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "変更が実施されるようにJOSM を停止しました" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15645,13 +15730,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "地理参照中にイメージ切り抜きを無効化" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Tableau d'Assemblageを選択" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "リスト中の最初のWMSレイヤを選択。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15707,5 +15797,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15716,13 +15806,13 @@ msgstr "水域(湖沼)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "シンボル" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15770,5 +15860,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15776,26 +15866,26 @@ msgstr "住所" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "セクション" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "自動キャッシュを有効にする" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "最大キャッシュサイズをMB単位で指定します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15812,18 +15902,18 @@ "CU_01_ConditionsGenerales_fr.html" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "可能な場合、キー \"source\" の値を自動化" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "情報ソース" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15831,5 +15921,5 @@ msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15838,127 +15928,132 @@ "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "複数レイヤーの重ね合わせを許可します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "WMSレイヤーを透明にします。右が不透明、左が透明です。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "WMSサーバからダウンロードしたデータの周囲に長方形を描画します。" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "画像解像度:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "高解像度(1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "中解像度(800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "低解像度 (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "ベクタイメージ取得倍率:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "より小さい画像を取得してください。(より高品質だがよりメモリを使う)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "固定サイズ正方形（初期値は100メートル）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "固定サイズ（25～1000メートル）" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "レイヤ:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +msgstr "川、遊泳用プールを参照" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "クリスチャンの十字架のようなシンボル。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "ラスタイメージ取得倍率:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "このサイズを超えると古いファイルは自動的に削除されます" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15966,5 +16061,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16385,4 +16480,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX ファイル (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "オブジェクトをダウンロード..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "選択されたウェイの最後にマップデータをダウンロード" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "すぐにダウンロード" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "ダウンロードするタスクを少なくとも一つ選んでください。" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "テスト {0}/{1}: {2} 開始" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "{0}:{1}を走査中にエラー" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16452,5 +16582,5 @@ #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188 msgid "Child script have returned invalid data." -msgstr "" +msgstr "子スクリプトが不正なデータを返した" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45 @@ -16460,19 +16590,19 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53 msgid "Name:" -msgstr "" +msgstr "名前:" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54 msgid "CmdLine:" -msgstr "" +msgstr "コマンド行" #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26 msgid "External tools" -msgstr "" +msgstr "外部ツール" #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" -msgstr "" +msgstr "JOSM中での外部スクリプトの使用" #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73 @@ -16487,5 +16617,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91 msgid "New tool..." -msgstr "" +msgstr "新しいツール...." #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54 @@ -16553,5 +16683,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "リフレッシュ" @@ -17104,30 +17234,31 @@ msgstr "測定" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "ミシガン左折" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "4 または5のウェイのセットに左折禁止を追加。" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "左折禁止をアサインする4 または5のウェイを選んでください。" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "閉じたリレーションを形成する4つのウェイを選択してください。" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "ウェイを並べられません。方向を確認してください。" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "ミシガン左折制限を作成" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "経由ノードが見つかりません。選択をチェックしてください" @@ -17248,13 +17379,13 @@ msgstr "キュー" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "オフライン" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "オンライン" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17767,9 +17898,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17812,5 +17938,5 @@ msgstr "変更セット # {0} を元に戻す" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17838,10 +17964,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19036,47 +19162,47 @@ msgstr "基本エディタに変更し、OSMウェイを選択" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "オブジェクト削除を取り消す..." -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "ＩＤでオブジェクトの削除を取り消し" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "新しいレイヤに追加するデータがあれば選択" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "削除を取り消すオブジェクトのIDを入力" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "オブジェクトの削除を取り消し" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "オブジェクトの削除を取り消す" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "削除の取り消しを開始" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "ダイアログを閉じてキャンセル" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19314,14 +19440,50 @@ msgstr "交差するウェイ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "ノードの複製" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "このテストは全く同じ位置にノードがないことをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "重複したノードを統合しますか？" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "ノードの複製" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "ノードの複製" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "重複したノードを統合しますか？" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "ノードの複製" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "重複したノードを統合しますか？" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "同位置のノード" @@ -19476,59 +19638,59 @@ msgstr "重なったウェイ" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "リレーションチェッカー:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "このプラグインはリレーション内のエラーをチェックします。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "リレーション種別が不明です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "リレーションは空です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "ロール{0} がありません" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "ロール検証に問題" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "ロール {0}は不明です" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "空のロールが見つかりました" @@ -20412,9 +20574,9 @@ msgstr "不正なURL？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "見えるタイルのダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20422,46 +20584,46 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "解像度の変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "誤ったタイルのリロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "アルファチャンネル" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "WMSレイヤーをファイルに保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "WMS レイヤーを保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "WMS レイヤーをロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "ファイルフォーマットエラー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "ファイルの読み込みエラー" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "WMSブックマークをセット" @@ -20607,231 +20769,126 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "行政区境" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "増加" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "線" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "マルチポリゴン" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "ネットワーク" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "公共輸送機関" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "通行制限" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "ルート" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "サイト" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "水路" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "全てのファイル" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "新しいフォルダを作成" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "ファイルを削除" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "ファイル名を入力:" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "パスまたはフォルダ名を入力:" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "エラー " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -20839,90 +20896,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "ファイル名:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "ファイル名：" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "ファイル" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "フィルタ:" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "フォルダ" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "ホーム" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "リスト" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "検索対象:" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "検索対象:" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "新しいフォルダ" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "選択したファイルを開く。" #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -20930,75 +20987,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "保存先:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "サイズ" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "アップデート" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -21063,11 +21120,17 @@ "へ直接アップロードします。" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "このトラックに沿ってOSMからダウンロード" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "オフセットのあるウェイを複製" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21078,20 +21141,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "ルーティング情報をルーティンググラフとして可視化する。" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "地図グリッドを表示する背景レイヤーを提供します。" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21104,10 +21167,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "WMS イメージのベクトル化を支援する" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21115,5 +21178,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21125,15 +21188,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "4 または5のウェイのセットに左折禁止を追加" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "単純にエリアをマルチポリゴンに変換します。" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21144,5 +21207,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21155,10 +21218,10 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "OpenLayers の背景画面を表示" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -21167,5 +21230,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21173,5 +21236,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21181,5 +21244,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21190,5 +21253,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -21199,10 +21262,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21210,15 +21273,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "変更セットを元に戻すプラグイン" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21228,5 +21291,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21238,10 +21301,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "ルーティング能力の提供" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21250,5 +21313,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21259,15 +21322,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "現在のGPS位置上にマーカー/ノードの追加を許可" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "表形式でタグ編集のダイアログ・ボックスを提供" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21280,10 +21343,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "1つのブロックからテラスハウスを作成する" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21292,5 +21355,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21299,5 +21362,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21306,10 +21369,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "OSMデータベースからの削除取消を許可" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21320,5 +21383,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21328,5 +21391,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21337,15 +21400,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21354,5 +21417,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -24785,10 +24848,10 @@ #: build/trans_presets.java:1352 msgid "E10 (10% Ethanol mix)" -msgstr "" +msgstr "E10 (10%エタノール混合)" #. item "Car/Fuel" check "E10 (10% Ethanol mix)" #: build/trans_presets.java:1353 msgid "E85 (85% Ethanol mix)" -msgstr "" +msgstr "E85(85%エタノール混合)" #. item "Car/Fuel" check "E85 (85% Ethanol mix)" @@ -26437,5 +26500,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "american_football" -msgstr "" +msgstr "アメリカンフットボール" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26467,5 +26530,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canadian_football" -msgstr "" +msgstr "カナディアンフットボール" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26512,5 +26575,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "gaelic_football" -msgstr "" +msgstr "ゲーリックフットボール" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26552,10 +26615,10 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "rugby_league" -msgstr "" +msgstr "ラグビーリーグ" #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "rugby_union" -msgstr "" +msgstr "(通常の)ラグビー" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27046,46 +27109,46 @@ #: build/trans_presets.java:2076 msgid "American Football" -msgstr "" +msgstr "アメリカンフットボール" #. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 msgid "Edit American Football" -msgstr "" +msgstr "アメリカンフットボールを編集" #: build/trans_presets.java:2082 msgid "Canadian Football" -msgstr "" +msgstr "カナディアンフットボール" #. item "Sport (Ball)/Canadian Football" #: build/trans_presets.java:2083 msgid "Edit Canadian Football" -msgstr "" +msgstr "カナディアンフットボールを編集" #: build/trans_presets.java:2088 msgid "Gaelic Football" -msgstr "" +msgstr "ゲーリックフットボール" #. item "Sport (Ball)/Gaelic Football" #: build/trans_presets.java:2089 msgid "Edit Gaelic Football" -msgstr "" +msgstr "ゲーリックフットボールを編集" #: build/trans_presets.java:2094 msgid "Rugby League" -msgstr "" +msgstr "ラグビーリーグ" #. item "Sport (Ball)/Rugby League" #: build/trans_presets.java:2095 msgid "Edit Rugby League" -msgstr "" +msgstr "ラグビーリーグの編集" #: build/trans_presets.java:2100 msgid "Rugby Union" -msgstr "" +msgstr "ラグビー(通常の)" #. item "Sport (Ball)/Rugby Union" #: build/trans_presets.java:2101 msgid "Edit Rugby Union" -msgstr "" +msgstr "ラグビー(通常の)の編集" #: build/trans_presets.java:2106 @@ -27951,8 +28014,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "線" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "細い線" @@ -33316,4 +33383,177 @@ msgstr "砂浜" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "ルート" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "行政区境" + #. color deprecated #. @@ -33832,4 +34072,7 @@ msgstr "Sicily - Italy" +#~ msgid "closedway" +#~ msgstr "閉じたウェイ" + #~ msgid "Move" #~ msgstr "移動" @@ -34179,7 +34422,4 @@ #~ msgid "Lambert Zone 4 cache file (.4)" #~ msgstr "Lambert Zone 4 cache file (.4)" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Tableau d'Assemblageを選択" #~ msgid "Open images with AgPifoJ..." @@ -34403,7 +34643,4 @@ #~ msgid "All the ways were empty" #~ msgstr "ウェイが全て空です。" - -#~ msgid "Please select at least one task to download" -#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。" #~ msgid "Open file (as raw gps, if .gpx)" Index: applications/editors/josm/i18n/po/nb.po =================================================================== --- applications/editors/josm/i18n/po/nb.po (revision 22464) +++ applications/editors/josm/i18n/po/nb.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 17:43+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 20:44+0000\n" "Last-Translator: Stian Ellingsen \n" "Language-Team: Norwegian Bokmal \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Hjelp" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Parameter \"downloadgps\" støtter ikke filnavn eller fil baner" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -230,8 +230,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -241,13 +241,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -263,5 +264,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -270,5 +271,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -285,13 +287,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Avbryt" @@ -352,11 +354,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -403,6 +405,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -430,5 +433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -552,5 +555,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -612,6 +615,6 @@ msgstr "Velg minst to linjer å sammenføye." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -620,9 +623,9 @@ msgstr "Kopier" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopier valgte objekter til utklippstavla." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Velg noe å kopiere." @@ -657,6 +660,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -725,5 +728,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separat lag" @@ -743,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objekttype:" @@ -752,5 +755,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objekt ID:" @@ -795,5 +798,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Fordoble" @@ -941,25 +944,25 @@ msgstr "Fant ingen skjæring. Ingen endringer ble gjort." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Noder er lagt til i alle skjæringspunkt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Reparer relasjoner" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Slo sammen områder som overlappet seg selv" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Slo sammen overlappende områder" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -967,33 +970,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Legg inn verdier for alle konflikter." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Reparer konflikter i egenskaper." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Fjernede Element fra Relasjoner" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Lukket linje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Fjern egenskaper fra indre linjer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Funksjon Slå sammen Areal" @@ -1012,5 +1015,5 @@ msgstr "Sammenføy node og linje" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Ingen hurtigtast" @@ -1355,6 +1358,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1365,17 +1368,17 @@ msgstr "Lim inn" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Lim inn fra utklippstavla." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Slett ufulstendige medlemer?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1384,14 +1387,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Lim inn egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Bruk egenskaper i utklippstavla på alle valgte element." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1400,5 +1403,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1467,5 +1470,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1476,12 +1479,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1508,6 +1511,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Feil" @@ -1535,5 +1538,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Lagre" @@ -1947,4 +1950,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Last ned data" @@ -2412,4 +2416,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2726,5 +2731,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -2923,5 +2928,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2942,9 +2947,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3045,5 +3050,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3138,5 +3143,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3150,5 +3155,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3336,11 +3341,42 @@ msgstr "Egenskaper for " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Roller i relasjoner som viser til" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Korriger egenskap automatisk" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Feil ved lesing av fil i mappa {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Klarte ikke å lage fullstendig sti til mappa {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Feil ved oppretting av mappe for mellomlager: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3542,5 +3578,5 @@ msgstr "Ø" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3548,5 +3584,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3586,5 +3622,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3625,6 +3661,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3636,5 +3671,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3646,7 +3680,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3864,7 +3897,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3872,29 +3905,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "uferdig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "ferdselsvei" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "jernbane" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vannvei" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "bruk av grunn" @@ -3902,7 +3935,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3914,5 +3947,5 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3971,6 +4004,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3978,6 +4011,6 @@ msgstr "bygning" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3986,5 +4019,5 @@ msgstr[1] "{0} medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4059,5 +4092,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4158,69 +4191,69 @@ msgstr "Passord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "bruk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "innstillinger" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Vis hjelp" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standard Unix-geometri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Last ned områdeavgrensing" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Last ned områdeavgrensing som rå gps" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "Velg med gitt søkestreng" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Start maksimert" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Gå tilbake til standardinnstillinger" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4230,9 +4263,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "eksempler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4240,46 +4273,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Klargjør" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Laster første programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Setter standardverdier" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Bygger opp hovedskjermbilde" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Laster inn programtillegg" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Løs" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Fil" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4298,10 +4347,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4309,10 +4358,11 @@ msgstr "Verktøy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Objektmaler" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4323,5 +4373,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4589,5 +4639,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4605,5 +4655,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4830,5 +4880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Opp" @@ -5051,6 +5101,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5065,6 +5115,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5125,17 +5175,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5206,20 +5256,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5228,5 +5280,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5238,5 +5290,5 @@ msgstr[1] "{0} linjer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5302,5 +5354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5404,5 +5456,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5804,5 +5856,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5885,5 +5937,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6085,5 +6137,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6936,5 +6988,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7504,5 +7556,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7633,5 +7685,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7688,26 +7740,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7716,14 +7768,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7733,9 +7785,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7745,15 +7797,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7761,5 +7813,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7767,20 +7819,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7789,64 +7841,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Sorter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Flytt valgte medlem opp" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Flytt valgt medlem ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7855,23 +7907,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7880,5 +7932,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7887,50 +7939,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7939,26 +7991,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8294,5 +8352,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9736,12 +9794,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Last ned fra OSM langs dette spor" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Last ned alt innenfor:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9749,8 +9811,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Max areal per forespørsel:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9774,4 +9838,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10219,10 +10284,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10231,5 +10296,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12426,5 +12491,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12433,53 +12498,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Mer informasjon om denne funksjonen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Valgfrie attributter:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "stengt_vei" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Ukjent type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12489,15 +12550,15 @@ msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Feil ved lesing av {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Element type {0} kan brukes." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12507,18 +12568,18 @@ msgstr[1] "Endre {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Utvalget passer ikke formålet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Bruk Objektmal" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Endre egenskaper" @@ -12533,4 +12594,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Søk: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Søk etter objekt." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Zoom til utvalg" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Søk: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13244,5 +13329,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13254,10 +13339,10 @@ msgstr "OSM-tjenerfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13266,5 +13351,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13988,11 +14073,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14001,16 +14086,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14019,5 +14104,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14280,5 +14365,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15000,14 +15085,14 @@ msgstr "Bygninger" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15039,5 +15124,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15094,5 +15179,5 @@ msgstr "Feil URL for lesing av Matrikkel." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15100,5 +15185,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15107,5 +15192,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Velg fra …" @@ -15113,17 +15198,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Velg kommune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Matrikkel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Auto sourcing" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15136,13 +15221,13 @@ "Vil du gjenopprette bruken av F11 til å laste ned bilder?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Gjenopprett F11-hurtigtast" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM avsluttes for at endringen skal tre i kraft." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15167,13 +15252,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Velg Tableau d'Assemblage" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15229,5 +15319,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15238,13 +15328,13 @@ msgstr "vann" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15292,5 +15382,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15298,26 +15388,26 @@ msgstr "adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Aktiviser automatisk mellomlager." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Max. lager størrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15334,9 +15424,9 @@ "
før du laster inn data med dette programtillegget." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Fransk cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15344,10 +15434,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15356,5 +15446,5 @@ "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15364,128 +15454,133 @@ "tekst på mørk bakgrunn." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Tillat stabling av flere lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Sett transperens på WMS lag. Høyre: opak, venstre: transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hent mindre bilder (høyere kvalitet men minnekrevende)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Fast kvadrat størrelse (standard er 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1000 meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "De eldste filene blir automatisk slettet når denne størrelsen overskrides" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15493,5 +15588,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15891,4 +15986,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX filer (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Last ned objekt..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Last ned fra OSM langs dette spor" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Last ned programtillegg" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Velg minst én oppgave å laste ned" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Feil ved innlesing {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15978,5 +16108,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16059,5 +16189,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Oppdater" @@ -16613,30 +16743,31 @@ msgstr "Mål" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16755,13 +16886,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17269,9 +17400,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17314,5 +17440,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17340,10 +17466,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18529,47 +18655,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18806,14 +18932,50 @@ msgstr "Kryssende linjer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Dobbelt-Noder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Dobbelt-Noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Dobbelt-Noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Dobbelt-Noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Dobbelt-Noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Dobbelt-Noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Dobbelt-Noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18968,59 +19130,59 @@ msgstr "Overlappende linjer" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19883,55 +20045,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Last ned synlige kartbilder" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Bytt oppløsning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Last ned kartbilder med feil på nytt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alpha channel" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Lagre WMS lag til fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Lagre WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "les inn WMS lag fra fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Last inn WMS-lag" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Feil Fil Format" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Feil ved lasting av fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -20076,398 +20238,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "grense" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "neste segment" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Stigning" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolygon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Nettverk" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "buss-, trikk- og togkart" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Forbud" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "rute" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Sted" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vannvei" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Oppdater" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20530,11 +20587,17 @@ "openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Last ned fra OSM langs dette spor" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Dupliser linjer med parallell avstand" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20544,20 +20607,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "Last ned GPS punkt fra Globalsat dg100 data logger direkte til JOSM" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Bakgrunnslag som viser rutenettet i kartet" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20570,10 +20633,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "For vektorisering av WMS bilder." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20583,5 +20646,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20594,15 +20657,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20611,5 +20674,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20622,15 +20685,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Viser bakgrunnsbildet i et åpent lag" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer tema fra OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20638,5 +20701,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20644,5 +20707,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20651,5 +20714,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20660,10 +20723,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20671,15 +20734,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "La andre program sende kommandoer til JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20689,5 +20752,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20698,10 +20761,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Gir deg Ruteplanlegger på OSM data." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20710,5 +20773,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20719,15 +20782,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Legger inn markører eller Noder på gps posisjon." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Dialog for å redigere egenskaper i en tabell." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20740,10 +20803,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Lager rekkehus / terassehus fra en enkel husblokk." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20752,5 +20815,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20759,5 +20822,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20766,10 +20829,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20780,5 +20843,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20788,5 +20851,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20795,15 +20858,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier." #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20812,5 +20875,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27405,10 +27468,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Stigning" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "motorway_link" #. item "Man Made/Power Line" combo "Voltage" @@ -32770,4 +32837,177 @@ msgstr "strand" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "rute" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "grense" + #. color deprecated #. @@ -33286,4 +33526,7 @@ msgstr "Sicilia, Italia" +#~ msgid "closedway" +#~ msgstr "stengt_vei" + #~ msgid "Move" #~ msgstr "Flytt" @@ -33751,7 +33994,4 @@ #~ msgid "Invalid projection" #~ msgstr "Ugyldig kartprojeksjon" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Velg Tableau d'Assemblage" #~ msgid "Auto-tag source added:" @@ -34022,7 +34262,4 @@ #~ msgid "aqueduct" #~ msgstr "akvadukt" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Velg minst én oppgave å laste ned" #~ msgid "Open in Browser" Index: applications/editors/josm/i18n/po/nl.po =================================================================== --- applications/editors/josm/i18n/po/nl.po (revision 22464) +++ applications/editors/josm/i18n/po/nl.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-09 09:49+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-21 16:02+0000\n" +"Last-Translator: Paul Smits \n" "Language-Team: Dutch \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: 2010-07-11 18:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Hulp" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ "Parameter \"downloadgps\" accepteert geen bestandsnamen of bestands-URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -237,8 +237,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -248,13 +248,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -270,5 +271,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -277,5 +278,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -292,13 +294,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Annuleren" @@ -360,11 +362,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -411,6 +413,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -438,5 +441,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -561,5 +564,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -623,6 +626,6 @@ msgstr "Selecteer twee of meer wegen om te combineren." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -631,9 +634,9 @@ msgstr "Kopiëren" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Geselecteerde objecten naar klembord kopiëren" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Selecteer iets om te kopiëren" @@ -668,6 +671,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -736,5 +739,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Laag scheiden" @@ -752,7 +755,8 @@ msgid "Select if the referrers of the object should be downloaded as well" msgstr "" +"Selecteer of de referrers van het object ook mee gedownload moeten worden." #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Object-type:" @@ -763,5 +767,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Object ID:" @@ -769,5 +773,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:65 msgid "Enter the ID of the object that should be downloaded" -msgstr "" +msgstr "Voer het ID van het te downloaden object in" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78 @@ -791,5 +795,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99 msgid "Invalid ID specified. Cannot download object." -msgstr "" +msgstr "Ongeldige ID opgegeven. Het object kan niet worden gedownload." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 @@ -808,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Dupliceren" @@ -956,25 +960,25 @@ msgstr "Geen kruispunt gevonden. Er is niets veranderd" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Knooppunten toegevoegd op alle kruispunten" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Wegen die niet deel van een binnenste multipoligoon zijn verwijderd" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Relaties gerepareerd" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Zichzelf overlappend gebied samengevoegd" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Zichzelf overlappend gebied samengevoegd" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -984,33 +988,33 @@ "of er geen fouten zijn geïntroduceerd." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Waarden voor alle conflicten invoeren." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Repareer tag conflikten" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "elementen verwijderd van relaties" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Samenvoegen gebieden: Korte wegen verwijderd" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Gesloten weg" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Tags van binnenste wegen verwijderd" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Gebied samenvoeg functie" @@ -1029,5 +1033,5 @@ msgstr "Knoop en lijn koppelen" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Geen sneltoets" @@ -1335,9 +1339,9 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81 msgid "Orthogonalize Shape / Undo" -msgstr "" +msgstr "Vorm loodrecht maken / Ongedaan maken" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80 msgid "Undo orthogonalization for certain nodes" -msgstr "" +msgstr "Loodrecht maken van bepaalde knopen ongedaan maken" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:101 @@ -1395,6 +1399,6 @@ msgstr "Selecteer wegen met hoeken rond de 90 of 180 graden." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1405,17 +1409,17 @@ msgstr "Plakken" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Inhoud van het buffer plakken." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Verwijder oncomplete delen?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Plakken zonder oncomplete delen" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1427,14 +1431,14 @@ "zonder de onvolledige primitieven?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Tags plakken" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Inhoudtags uit klembord toepassen op alle geselecteerde items." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1443,5 +1447,5 @@ msgstr[1] "Plakken {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1510,5 +1514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1519,12 +1523,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1551,6 +1555,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Fout" @@ -1578,5 +1582,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Opslaan" @@ -1721,15 +1725,15 @@ #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 msgid "Cancel operation" -msgstr "" +msgstr "Operatie annuleren" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74 msgid "Do you want to delete them anyway?" -msgstr "" +msgstr "Wilt u ze toch verwijderen?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:88 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:75 msgid "Delete nodes outside of data regions?" -msgstr "" +msgstr "Knopen buiten de gegevensgebieden verwijderen?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101 @@ -1744,10 +1748,10 @@ #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87 msgid "Yes" -msgstr "" +msgstr "Ja" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:113 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87 msgid "Simplify all selected ways" -msgstr "" +msgstr "Alle geselecteerde wegen vereenvoudigen" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126 @@ -1757,9 +1761,11 @@ "The selection contains {0} ways. Are you sure you want to simplify them all?" msgstr "" +"De selectie bevat {0} wegen. Weet u zeker dat u deze allemaal wilt " +"vereenvoudigen?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89 msgid "Simplify ways?" -msgstr "" +msgstr "Wegen vereenvoudigen?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:180 @@ -1768,6 +1774,6 @@ msgid "Simplify {0} way" msgid_plural "Simplify {0} ways" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} weg vereenvoudigen" +msgstr[1] "{0} wegen vereenvoudigen" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:251 @@ -2004,4 +2010,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Ophalen data" @@ -2061,4 +2068,6 @@ "''{0}''.
You have to resolve them first." msgstr "" +"De gegevens die upgeload moeten worden verkeren in onopgeloste " +"conflicten in laag \"{0}\".
U moet deze eerst oplossen." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153 @@ -2268,5 +2277,11 @@ "report a conflict." msgstr[0] "" +"Er is {0} object in uw lokale gegevensset die mogelijk verwijderd is op de " +"server. Wanneer u dit object wilt verwijderen of bijwerken zal de server " +"waarschijnlijk een conflict rapporteren." msgstr[1] "" +"Er zijn {0} objecten in uw lokale gegevensset die mogelijk verwijderd zijn " +"op de server. Wanneer u dit object wilt verwijderen of bijwerken zal de " +"server waarschijnlijk een conflict rapporteren." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169 @@ -2277,14 +2292,18 @@ "Click {0} to check the state of these objects on the server." msgstr[0] "" +"Klik op {0} om de status van dit object op de server te " +"controleren." msgstr[1] "" +"Klik op {0} om de status van deze objecten op de server te " +"controleren." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "Click {0} to ignore." -msgstr "" +msgstr "Klik op {0} om te negeren." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178 msgid "Deleted or moved objects" -msgstr "" +msgstr "Verwijderde of verplaatste objecten" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244 @@ -2304,12 +2323,12 @@ msgid "There was {0} conflict during import." msgid_plural "There were {0} conflicts during import." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Er was {0} conflict tijdens het importeren." +msgstr[1] "Er waren {0} conflicten tijdens het importeren." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:181 msgid "Conflict during download" msgid_plural "Conflicts during download" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Conflict tijdens het downloaden" +msgstr[1] "Conflicten tijdens het downloaden" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222 @@ -2330,5 +2349,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Error during download" -msgstr "" +msgstr "Fout tijdens het downloaden" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 @@ -2461,5 +2480,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29 msgid "Drag play head" -msgstr "" +msgstr "Speelkop verslepen" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2478,4 +2497,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2638,9 +2658,9 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" -msgstr "" +msgstr "alle objecten" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." -msgstr "" +msgstr "Onvolledige en verwijderde objecten ook doorzoeken." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 @@ -2654,5 +2674,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." -msgstr "" +msgstr "\"Bakkerstraat\" - ''Bakkerstraat'' in elke sleutel of naam." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 @@ -2678,5 +2698,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" -msgstr "" +msgstr "oneway? - oneway=yes, true, 1 of on" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 @@ -2711,4 +2731,6 @@ "assigned version)" msgstr "" +"version:... - object met bepaalde versie (0 objecten zonder " +"toegewezen versie)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 @@ -2717,4 +2739,6 @@ "assigned changeset)" msgstr "" +"changeset:... - object met een bepaalde changeset ID (0 objecten " +"zonder een toegewezen changeset)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 @@ -2734,5 +2758,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" -msgstr "" +msgstr "role:... - object een gegeven rol in een relatie" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 @@ -2779,4 +2803,6 @@ msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" +"Gebruik \" om operatoren te citeren (bijv. of een sleutel : " +"bevat)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 @@ -2796,5 +2822,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -3003,5 +3029,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3022,9 +3048,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3127,5 +3153,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dubbel conflict" @@ -3222,5 +3248,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3234,5 +3260,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Bevestig verwijderen" @@ -3419,11 +3445,42 @@ msgstr "Eigenschappen van " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Rollen in relaties verwijzen naar" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatische tagcorrectie" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Bestanden uit map {0} halen is mislukt\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Kan geen canoniek pad voor map {0} krijgen\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Aanmaken map voor buffergeheugen is mislukt: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3629,5 +3686,5 @@ msgstr "O" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3635,5 +3692,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3673,5 +3730,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3712,6 +3769,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3723,5 +3779,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3733,7 +3788,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3951,7 +4005,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3959,29 +4013,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "onvolledig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "snelweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "spoorweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "waterweg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "grondgebruik" @@ -3989,7 +4043,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4001,5 +4055,5 @@ msgstr[1] "{0} knopen" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -4058,6 +4112,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4065,6 +4119,6 @@ msgstr "gebouw" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4073,5 +4127,5 @@ msgstr[1] "{0} leden" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4146,5 +4200,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4247,69 +4301,69 @@ msgstr "Wachtwoord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "gebruik" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "opties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Deze hulptekst tonen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standaard UNIX-geometrieargument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Het omgrensde gebied downloaden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Het omgrensde gebied downloaden als rawe GPS" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "Met de opgegeven zoekactie selecteren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Gemaximaliseerd openen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "De voorkeuren herstellen op standaardwaarden" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4319,9 +4373,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "voorbeelden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4329,37 +4383,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Initialiseren" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Vroege plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Standaarden instellen" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Hoofdscherm aanmaken" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Plugins laden" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Oplossen" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4368,9 +4438,9 @@ "gebruikt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Bestand" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4389,10 +4459,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Beeld" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4400,10 +4470,11 @@ msgstr "Gereedschappen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Voorkeuze" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4414,5 +4485,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Geluid" @@ -4682,5 +4753,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4698,5 +4769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4901,5 +4972,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Omhoog" @@ -5116,6 +5187,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5130,6 +5201,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5190,17 +5261,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5271,20 +5342,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5293,5 +5366,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5303,5 +5376,5 @@ msgstr[1] "{0} wegen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5367,5 +5440,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5469,5 +5542,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5873,5 +5946,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5954,5 +6027,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6156,5 +6229,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -7007,5 +7080,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7575,5 +7648,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7704,5 +7777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7759,26 +7832,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7787,14 +7860,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7804,9 +7877,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7816,15 +7889,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7832,5 +7905,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7838,20 +7911,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7860,64 +7933,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "De geselecteerde leden omhoog verplaatsen" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "De geselecteerde leden omlaag verplaatsen" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7926,23 +7999,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7951,5 +8024,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7958,50 +8031,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Leden downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8010,26 +8083,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8366,5 +8445,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9817,12 +9896,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Uit OSM langs deze track downloaden" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Alles downloaden binnen:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9830,8 +9913,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maximum oppervlak per verzoek:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9855,4 +9940,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10300,10 +10386,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10312,5 +10398,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12519,5 +12605,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12526,53 +12612,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Meer informatie over deze functionaliteit" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Optionele attributen:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "afgesloten weg" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Onbekend type: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12582,15 +12664,15 @@ msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Fout bij ontleden van {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementen van type {0} worden ondersteund." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12600,18 +12682,18 @@ msgstr[1] "{0} objecten wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Niets geselecteerd!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Selectie is ongeschikt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Voorinstelling toepassen" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Eigenschappen veranderen" @@ -12626,4 +12708,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Zoeken" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Naar objecten zoeken." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Op selectie inzoomen." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Naar objecten zoeken." #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13327,5 +13433,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13337,10 +13443,10 @@ msgstr "OSM Server bestanden" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13349,5 +13455,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14073,11 +14179,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14086,16 +14192,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14104,5 +14210,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14363,5 +14469,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15081,14 +15187,14 @@ msgstr "Gebouwen" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15120,5 +15226,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15175,5 +15281,5 @@ msgstr "CadastreGrabber: ongeldige URL." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15181,5 +15287,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15188,5 +15294,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Kies uit..." @@ -15194,17 +15300,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Gemeente selecteren" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Kadaster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Automatisch vullen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15213,13 +15319,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15244,13 +15350,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Tableau d'Assemblage selecteren" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15306,5 +15417,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15315,13 +15426,13 @@ msgstr "water" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15369,5 +15480,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15375,26 +15486,26 @@ msgstr "adres" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Automatisch bufferen inschakelen" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Max. buffergrootte (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15406,9 +15517,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Franse kadaster WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15416,10 +15527,10 @@ "ingeschakeld" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Bron" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15429,5 +15540,5 @@ "in de JOSM-voorkeuren is opgegeven." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15437,9 +15548,9 @@ "tekst op donkere achtergronden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Stapelen van meerdere lagen toestaan" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -15447,116 +15558,121 @@ "doorzichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Neem kleinere afbeeldingen (hogere kwaliteit, maar gebruikt meer geheugen)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Vaste vierkant groote (standaard is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Vaste groote (van 25 tot 1000 meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -15564,5 +15680,5 @@ "overschreden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15570,5 +15686,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15967,4 +16083,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Object downloaden" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Uit OSM langs deze track downloaden" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Gebied downloaden" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Selecteer tenminste één taak om te downloaden" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Fout bij ontleden {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16054,5 +16205,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16135,5 +16286,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Herteken" @@ -16690,30 +16841,31 @@ msgstr "Metingen" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16831,13 +16983,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17345,9 +17497,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17390,5 +17537,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17416,10 +17563,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18599,47 +18746,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18876,15 +19023,51 @@ msgstr "Kruisende wegen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Dubbele knopen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Deze test controleert of er geen knopen met precies dezelfde locatie zijn." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Dubbele knopen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Dubbele knopen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Dubbele knopen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Dubbele knopen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Dubbele knopen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Dubbele knopen" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -19039,59 +19222,59 @@ msgstr "Overlappende wegen" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19966,9 +20149,9 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Zichtbare tegels downloaden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -19976,46 +20159,46 @@ "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Resolutie veranderen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Foutieve tegels herladen" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "WMS-laag in bestand opslaan" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "WMS-laag uit bestand laden" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Fout in bestandsindeling" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Laden bestand is mislukt" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -20161,398 +20344,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "grens" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Metingen" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Pijplijn" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolygoon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Netwerk" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "overzichtskaart" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Beperking" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "route" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Plakken" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "waterweg" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Update" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20609,11 +20687,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Uit OSM langs deze track downloaden" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20622,20 +20706,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20645,10 +20729,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20656,5 +20740,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20664,15 +20748,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20681,5 +20765,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20689,15 +20773,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20705,5 +20789,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20711,5 +20795,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20718,5 +20802,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20725,10 +20809,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20736,15 +20820,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20754,5 +20838,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20761,10 +20845,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20773,5 +20857,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20780,15 +20864,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20798,10 +20882,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20810,5 +20894,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20817,5 +20901,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20824,10 +20908,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20836,5 +20920,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20844,5 +20928,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20851,15 +20935,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20868,5 +20952,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27461,10 +27545,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Pijplijn" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "op- en afrit autosnelweg" #. item "Man Made/Power Line" combo "Voltage" @@ -32826,4 +32914,177 @@ msgstr "strand" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "route" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "grens" + #. color deprecated #. @@ -33342,4 +33603,7 @@ msgstr "Sicilië - Italië" +#~ msgid "closedway" +#~ msgstr "afgesloten weg" + #~ msgid "Select a bookmark first." #~ msgstr "Selecteer eerst een bladwijzer." @@ -33483,7 +33747,4 @@ #~ msgid "y from" #~ msgstr "y van" - -#~ msgid "Download Area" -#~ msgstr "Gebied downloaden" #~ msgid "Edit Properties" @@ -33978,7 +34239,4 @@ #~ msgstr "Wegen combineren ondanks verschillende relaties?" -#~ msgid "Please select at least one task to download" -#~ msgstr "Selecteer tenminste één taak om te downloaden" - #~ msgid "No document open so nothing to save." #~ msgstr "Geen document geopend, dus ook niets om op te slaan." @@ -34278,7 +34536,4 @@ #~ msgstr "Onjuiste projectie" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Tableau d'Assemblage selecteren" - #~ msgid "Continue anyway" #~ msgstr "Toch doorgaan" Index: applications/editors/josm/i18n/po/pl.po =================================================================== --- applications/editors/josm/i18n/po/pl.po (revision 22464) +++ applications/editors/josm/i18n/po/pl.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-11 16:56+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-24 19:14+0000\n" "Last-Translator: Rafał \n" "Language-Team: Polish \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-07-11 18:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -27,11 +27,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Pomoc" @@ -44,5 +44,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -75,7 +75,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -107,5 +107,5 @@ msgstr "Parametr \"downloadgsp\" nie przyjmuje nazw plików lub adresów URL" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -239,8 +239,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -250,13 +250,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -272,5 +273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -279,5 +280,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -294,13 +296,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Anuluj" @@ -361,11 +363,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -412,6 +414,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -439,5 +442,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -561,5 +564,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -623,6 +626,6 @@ msgstr "Wybierz co najmniej dwie drogi do połączenia." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -631,9 +634,9 @@ msgstr "Kopiuj" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopiuje zaznaczone obiekty do schowka." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Proszę wybrać coś do skopiowania." @@ -668,6 +671,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -738,5 +741,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Osobna wartwa" @@ -756,5 +759,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Typ obiektu:" @@ -765,5 +768,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID obiektu:" @@ -808,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Powiel" @@ -956,25 +959,25 @@ msgstr "Brak części wspólnej. Nic nie zmieniono." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Dodano węzły na wszystkich przecięciach" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Popraw relacje" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Połączono nakładające się obszary" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Połączono nakładające się na siebie obszary" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -984,33 +987,33 @@ "sprawdzić czy wprowadzone zmiany nie spowodowały błędów." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Podaj wartości dla wszystkich konfliktów." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Rozwiąż konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Popraw konflikty tagów" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Usuń Element z Relacji" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Połącz obszary: Usuń krótkie drogi" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Droga zamknięta" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Usunięto tagi z dróg wewnętrznych" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Funkcja łączenia obszarów" @@ -1029,5 +1032,5 @@ msgstr "Połącz węzeł i linię" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Brak skrótu" @@ -1384,6 +1387,6 @@ "Proszę wybrać drogi w których kąty w przybliżeniu mają 90 lub 180 stopni." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1394,17 +1397,17 @@ msgstr "Wklej" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Wkleja zawartość schowka." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Usunąć niekompletnych członków?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Wklej pomijając niekompletne" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1413,14 +1416,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Wklej znaczniki" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1430,5 +1433,5 @@ msgstr[2] "Wklejam {0} tagi" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1498,5 +1501,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1507,12 +1510,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1539,6 +1542,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Błąd" @@ -1566,5 +1569,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Zapisz" @@ -1984,4 +1987,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "" @@ -2224,4 +2228,6 @@ "server" msgstr "" +"Kliknij aby sprawdzić czy obiekty w lokalnym zestawie danych zostały " +"usunięte z serwera" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:154 @@ -2245,5 +2251,15 @@ "report a conflict." msgstr[0] "" +"Jest {0} obiekt w twoim lokalnym zestawie danych który może być usunięty na " +"serwerze. Jeśli później spróbujesz go usunąć lub zaktualizować serwer może " +"raportować konflikt." msgstr[1] "" +"Jest {0} obiekty w twoim lokalnym zestawie danych które mogą być usunięte na " +"serwerze. Jeśli później spróbujesz je usunąć lub zaktualizować serwer może " +"raportować konflikt." +msgstr[2] "" +"Jest {0} obiektów w twoim lokalnym zestawie danych które mogą być usunięte " +"na serwerze. Jeśli później spróbujesz je usunąć lub zaktualizować serwer " +"może raportować konflikt." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169 @@ -2254,14 +2270,18 @@ "Click {0} to check the state of these objects on the server." msgstr[0] "" +"Kliknij {0} aby sprawdzić stan tego obiektu na serwerze." msgstr[1] "" +"Kliknij {0} aby sprawdzić stan tych obiektów na serwerze." +msgstr[2] "" +"Kliknij {0} aby sprawdzić stan tych obiektów na serwerze." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "Click {0} to ignore." -msgstr "" +msgstr "Kliknij {0} aby zignorować." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178 msgid "Deleted or moved objects" -msgstr "" +msgstr "Usunięte lub przeniesione obiekty" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244 @@ -2453,4 +2473,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2765,5 +2786,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filtr" @@ -2961,5 +2982,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2980,9 +3001,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3084,5 +3105,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3179,5 +3200,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3191,5 +3212,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Potwierdź usunięcie." @@ -3377,11 +3398,42 @@ msgstr "Właściwości " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatyczna korekcja tagów" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Błąd w czasie ładowania strony {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3600,5 +3652,5 @@ msgstr "E" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3606,5 +3658,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3647,5 +3699,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3671,5 +3723,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743 msgid "A primitive with ID = 0 cannot be invisible." -msgstr "" +msgstr "Element z ID = 0 nie może być niewidoczny" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339 @@ -3686,6 +3738,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3698,5 +3749,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3709,7 +3759,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3755,17 +3804,17 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 msgid "Relation: selected" -msgstr "" +msgstr "Relacja: zaznaczona" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 msgid "Node: standard" -msgstr "" +msgstr "Węzeł: standardowy" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 msgid "Node: connection" -msgstr "" +msgstr "Węzeł: połączony" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "Node: tagged" -msgstr "" +msgstr "Węzeł: otagowany" #. teal @@ -3928,7 +3977,7 @@ msgstr "Nie pokazuj ponownie (zapamiętaj wybór)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3936,29 +3985,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "niekompletne" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "droga" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "tory kolejowe" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "szlak wodny" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "zagospodarowanie przestrzenne" @@ -3966,7 +4015,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3979,5 +4028,5 @@ msgstr[2] "{0} węzłów" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -4036,6 +4085,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4043,6 +4092,6 @@ msgstr "budynek" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4052,5 +4101,5 @@ msgstr[2] "{0} elementów" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4125,10 +4174,10 @@ msgstr "Obiekt usunięty" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" -msgstr "" +msgstr "Pokazuje informację pomocy" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70 @@ -4218,69 +4267,69 @@ msgstr "Hasło" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "użycie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "opcje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Wyświetl tę pomoc" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +msgid "Standard unix geometry argument" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" +msgid "Download the bounding box" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 -msgid "Download the bounding box" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" +msgid "Download the bounding box as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 -msgid "Download the bounding box as raw gps" +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 -msgid "Select with the given search" +msgid "Launch in maximized mode" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Reset the preferences to default" msgstr "Przywróć domyślne ustawienia" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Zmień folder dla ustawień wszystkich użytkowników." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4290,9 +4339,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "przykłady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4300,46 +4349,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Inicjalizacja" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Ładowanie wczesnych wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Zapisywanie domyślnych ustawień" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Przygotowywanie interfejsu użytkownika" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Ładowanie wtyczek" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Rozwiąż" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Plik" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4358,10 +4423,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Widok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4369,10 +4434,11 @@ msgstr "Narzędzia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Szablony" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4383,5 +4449,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Dźwięk" @@ -4632,5 +4698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17 msgid "My with Their" -msgstr "" +msgstr "Moją z Ich" #. * @@ -4639,5 +4705,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22 msgid "My with Merged" -msgstr "" +msgstr "Moją z Połączoną" #. * @@ -4646,5 +4712,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27 msgid "Their with Merged" -msgstr "" +msgstr "Ich z Połączoną" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82 @@ -4657,10 +4723,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" -msgstr "" +msgstr "Właściwości" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4678,5 +4744,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4712,5 +4778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" -msgstr "" +msgstr "Węzły (z konfliktami)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 @@ -4730,5 +4796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" -msgstr "" +msgstr "Członkowie (z konfliktami)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 @@ -4742,5 +4808,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" -msgstr "" +msgstr "Właściwości (z konfliktami)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 @@ -4785,5 +4851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237 msgid "lock scrolling" -msgstr "" +msgstr "zablokuj przewijanie" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245 @@ -4883,5 +4949,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "W górę" @@ -4917,18 +4983,18 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828 msgid "Freeze" -msgstr "" +msgstr "Zablokuj" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829 msgid "Freeze the current list of merged elements." -msgstr "" +msgstr "Blokuje bierzącą listę połączonych elementów." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824 msgid "Unfreeze" -msgstr "" +msgstr "Odblokuj" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825 msgid "Unfreeze the list of merged elements and start merging." -msgstr "" +msgstr "Odblokowuje bierzącą listę połączonych elementów." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850 @@ -4938,4 +5004,6 @@ "html>" msgstr "" +"Kliknij {0} aby rozpocząć łączenie swoich i ich " +"wpisów." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855 @@ -4945,4 +5013,6 @@ "html>" msgstr "" +"Kliknij {0}aby zakończyć łączenie swoich i ich wpisów." +"" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873 @@ -5101,6 +5171,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5115,6 +5185,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5175,17 +5245,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Anuluj rozwiązywanie konfliktów" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Zastosuj rozwiązane konflikty" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5256,20 +5326,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5278,5 +5350,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5289,5 +5361,5 @@ msgstr[2] "{0} dróg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5355,5 +5427,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Wartość:" @@ -5438,5 +5510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300 msgid "Select all objects assigned to the currently selected changesets" -msgstr "" +msgstr "Zaznacza wszystkie obiekty będące częścią wybranych zestawów danych" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:349 @@ -5448,5 +5520,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350 msgid "Download information about the selected changesets from the OSM server" -msgstr "" +msgstr "Pobiera informacje o wybranych zestawach danych z serwera OSM" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385 @@ -5461,9 +5533,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417 msgid "Open a web page for each selected changeset" -msgstr "" +msgstr "Otwiera stronę internetową dla każdego zaznaczonego zestawu danych" #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Szczegóły" @@ -5505,5 +5577,5 @@ msgid "" "Selects the objects that take part in this command (unless currently deleted)" -msgstr "" +msgstr "Zaznacza obiekty które brały udział w poleceniu (poza usuniętymi)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375 @@ -5545,9 +5617,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" -msgstr "" +msgstr "Zastosuj rozwiązanie konfliktów i zamknij okno" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" -msgstr "" +msgstr "Zastosuj rozwiązanie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 @@ -5862,8 +5934,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:358 msgid "Create a new relation" -msgstr "Utwórz nową relację" +msgstr "Tworzy nową relację" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Tworzy kopię tej relacji i otwiera ją w nowym oknie edytora relacji" @@ -5871,5 +5943,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433 msgid "Set the current selection to the list of selected relations" -msgstr "" +msgstr "Zaznacza relacje wybrane z listy relacji" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460 @@ -5915,5 +5987,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 msgid "Search for objects" -msgstr "" +msgstr "Wyszukuje obiekty" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:353 @@ -5938,5 +6010,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104 msgid "Select in relation list" -msgstr "" +msgstr "Zaznacz na liście relacji" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448 @@ -5946,5 +6018,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6085,5 +6157,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410 msgid "Close the selected changesets" -msgstr "" +msgstr "Zamyka wybrane zestawy zmian" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448 @@ -6149,7 +6221,7 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" -msgstr "Status" +msgstr "Otwórz" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46 @@ -7000,5 +7072,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7478,5 +7550,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54 msgid "From URL" -msgstr "" +msgstr "Z adresu URL" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55 @@ -7571,5 +7643,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7615,5 +7687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533 msgid "Properties for selected objects." -msgstr "" +msgstr "Otwiera właściwości zaznaczonego obiektu" #. setting up the membership table @@ -7666,5 +7738,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101 msgid "Select relation" -msgstr "" +msgstr "Zaznacz relację" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1102 @@ -7702,5 +7774,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7757,26 +7829,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tagi i Członkowie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7785,14 +7857,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7802,9 +7874,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7814,15 +7886,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Dodaje wszystkie obecnie zaznaczone elementy przed pierwszym członkiem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "Dodaje wszystkie obecnie zaznaczone elementy po ostatnim członku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7832,5 +7904,5 @@ "członkiem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7840,20 +7912,20 @@ "członkiem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7862,64 +7934,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Zaznacza elementy dla wybranych członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Sortuj członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Odwróć kolejność członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Przesuń aktualnie zaznaczonych członkół w górę" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Usuwa zaznaczonych członków tej relacji" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Usuwa obecnie edytowaną relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7928,23 +8000,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7953,5 +8025,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7960,50 +8032,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Zastosuj zmiany" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Zastosuj zmiany i zamknij okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Anuluj aktualizowanie i zamknij okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Pobierz wszystkich brakujących członków relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Pobierz członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Pobiera zaznaczonych niekompletnych członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Ustaw rolę dla zaznzczonych członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Zastosuj rolę" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8012,26 +8084,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8369,5 +8447,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -8856,13 +8934,13 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88 msgid "Open changesets" -msgstr "" +msgstr "Otwarte zestawy zmian" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119 msgid "Close changesets" -msgstr "" +msgstr "Zamknij zestawy zmian" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121 msgid "Close the selected open changesets" -msgstr "" +msgstr "Zamyka zaznaczone otwarte zestawy zmian" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144 @@ -8872,10 +8950,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38 msgid "Closing changeset" -msgstr "" +msgstr "Zamykanie zestawu zmian" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76 #, java-format msgid "Closing changeset {0}" -msgstr "" +msgstr "Zamykam zestaw zmian {0}" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99 @@ -8986,10 +9064,10 @@ #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." -msgstr "" +msgstr "Warstwa \"{0}\" posiada zmiany które powinny być wysłane na serwer." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." -msgstr "" +msgstr "Warstwa \"{0}\" nie posiada zmiany które powinny być wysłane." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 @@ -8999,9 +9077,11 @@ "''{1}''." msgstr "" +"Warstwa \"{0}\" posiada zmiany które powinny być zapisane z powiązanym " +"plikiem \"{1}\"." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." -msgstr "" +msgstr "Warstwa \"{0}\" nie posiada zmiany które powinny być zapisane." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 @@ -9016,5 +9096,5 @@ #, java-format msgid "Layer ''{0}'' is not backed by a file" -msgstr "" +msgstr "Warstwa \"{0}\" nie posiada powiązanego pliku" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 @@ -9032,5 +9112,5 @@ #, java-format msgid "Saving layer to ''{0}'' ..." -msgstr "" +msgstr "Zapisuję warstwę do ''{0}'' ..." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114 @@ -9097,5 +9177,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" -msgstr "" +msgstr "Zamknij to okno i powróć do edycji w JOSM" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 @@ -9105,5 +9185,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318 msgid "Exit JOSM without saving. Unsaved changes are lost." -msgstr "" +msgstr "Zamknij JOSM bez zapisywania. Niezapisane dane zostaną utracone." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 @@ -9227,5 +9307,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:56 msgid "Update objects" -msgstr "" +msgstr "Aktualizacja obiektów" #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:107 @@ -9694,9 +9774,12 @@ "them with audio data." msgstr "" +"Dane z warstwy GPX ''{0}'' zostały pobrane z serwera.
Z tego powodu " +"punkty drogi nie zawierają znaczników czasu i niemożliwe jest zestawienie z " +"nimi dźwięku." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316 msgid "Import not possible" -msgstr "" +msgstr "Import nie jest możliwy" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255 @@ -9720,4 +9803,7 @@ "them with images." msgstr "" +"Dane z warstwy GPX ''{0}'' zostały pobrane z serwera.
Z tego powodu " +"punkty drogi nie zawierają znaczników czasu i niemożliwe jest zestawienie z " +"nimi obrazków." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381 @@ -9750,9 +9836,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 msgid "Timespan" -msgstr "" +msgstr "Zakres czasu" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393 msgid "Length" -msgstr "" +msgstr "Długość" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454 @@ -9806,12 +9892,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Pobierz dane OSM wzdłuż tej ścieżki" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Pobierz wszystko pomiędzy:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9819,8 +9909,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maksymalny obszar na zapytanie:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9844,4 +9936,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -9916,5 +10009,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" -msgstr "" +msgstr "nieznana" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 @@ -9926,17 +10019,17 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" -msgstr "" +msgstr "Konwertuj na warstwę GPX" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" -msgstr "" +msgstr "Test zgodności zestawu danych" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" -msgstr "" +msgstr "Nie znaleziono żadnych problemów" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" -msgstr "" +msgstr "Znaleziono następujące problemy:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 @@ -10284,10 +10377,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10296,5 +10389,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -11450,5 +11543,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89 msgid "Draw lines between raw GPS points" -msgstr "" +msgstr "Rysuj linie pomiędzy punktami GPS" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111 @@ -11813,5 +11906,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207 msgid "Use default" -msgstr "" +msgstr "Użyj domyślny" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217 @@ -11874,9 +11967,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:93 msgid "Close the preferences dialog and discard preference updates" -msgstr "" +msgstr "Zamknij okno ustawień i odrzuć zmiany w ustawieniach" #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:111 msgid "Save the preferences and close the dialog" -msgstr "" +msgstr "Zapisuje ustawienia i zamyka okno" #. some common tabs @@ -11998,10 +12091,10 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:156 msgid "Active styles" -msgstr "" +msgstr "Aktywne style" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:166 #, java-format msgid "Available styles (from {0})" -msgstr "" +msgstr "Dostępne style (z {0})" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:172 @@ -12012,25 +12105,25 @@ #, java-format msgid "Short Description: {0}" -msgstr "" +msgstr "Krótki opis: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:425 #, java-format msgid "URL: {0}" -msgstr "" +msgstr "URL: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:427 #, java-format msgid "Author: {0}" -msgstr "" +msgstr "Autor: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:430 #, java-format msgid "Webpage: {0}" -msgstr "" +msgstr "Strona internetowa: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:436 #, java-format msgid "Version: {0}" -msgstr "" +msgstr "Wersja: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 @@ -12054,5 +12147,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:508 msgid "Add the selected available styles to the list of active styles" -msgstr "" +msgstr "Dodaje zaznaczone dostępne style do listy aktywnych stylów" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:531 @@ -12196,15 +12289,15 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113 msgid "Ask before updating" -msgstr "" +msgstr "Pytaj przed aktualizacją" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118 msgid "Always update withouth asking" -msgstr "" +msgstr "Zawsze aktualizuj bez pytania" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:123 msgid "Never update" -msgstr "" +msgstr "Nigdy nie aktualizuj" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84 @@ -12213,8 +12306,10 @@ "startup after an update of JOSM itself." msgstr "" +"Proszę zdecydować czy JOSM może automatycznie aktualizować aktywne wtyczki " +"na starcie po własnej aktualizacji JOSM." #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96 msgid "Update interval (in days):" -msgstr "" +msgstr "Czas pomiędzy aktualizacjami (w dniach):" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128 @@ -12223,4 +12318,6 @@ "certain periode of time." msgstr "" +"Proszę zdecydować czy JOSM może automatycznie aktualizować aktywne wtyczki " +"po określonym czasie." #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51 @@ -12494,5 +12591,5 @@ msgstr "Dodaje nowy tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12501,53 +12598,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Więcej informacji na temat tej funkcji" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Dostępne role" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "rola" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "liczba" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "elementy" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Dodatkowe atrybuty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "zamknięta droga" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Nieznany typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12557,15 +12650,15 @@ msgstr "Nie można odczytać źródła szablonów: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Błąd podczas przetwarzania {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu {0} nie są wspierane." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12576,18 +12669,18 @@ msgstr[2] "Zmień {0} obiektów" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nic nie wybrano!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Nieodpowiednie zaznaczenie." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Zastosuj szablon" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Zmień właściwości" @@ -12596,10 +12689,34 @@ #, java-format msgid "Preset group {1} / {0}" -msgstr "" +msgstr "Grupa szablonów {1} / {0}" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26 #, java-format msgid "Preset group {0}" -msgstr "" +msgstr "Grupa szablonów {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Wyszukuje obiekty" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Wyszukuje obiekty" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Powiększ do zaznaczenia" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Wyszukuje obiekty" #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -12793,10 +12910,10 @@ #, java-format msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" +msgstr "Nie można odczytać pliku ''{0}''.
Błąd w:
{1}" #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76 #, java-format msgid "Could not read files.
Error is:
{0}" -msgstr "" +msgstr "Nie można odczytać plików.
Błąd w:
{0}" #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41 @@ -13303,5 +13420,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13313,10 +13430,10 @@ msgstr "Pliki serwera OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "Podczas zapisywania wystąpił błąd.
Błąd:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13327,5 +13444,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13823,5 +13940,12 @@ "are:" msgstr[0] "" +"Wtyczka {0} wymaga wtyczki która nie została znaleziona. Brakująca wtyczka " +"to:" msgstr[1] "" +"Wtyczka {0} wymaga {1} wtyczek które nie zostały znalezione. Brakujące " +"wtyczki to:" +msgstr[2] "" +"Wtyczka {0} wymaga {1} wtyczek które nie zostały znalezione. Brakujące " +"wtyczki to:" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 @@ -13831,4 +13955,6 @@ "
You have to update JOSM in order to use this plugin." msgstr "" +"Wtyczka {0} wymaga JOSM w wersji {1}. Obecna wersja JOSM to {2}." +"
Niezbędna jest aktualizacja JOSM aby wykorzystać tą wtyczkę." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378 @@ -13855,5 +13981,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412 msgid "Checking plugin preconditions..." -msgstr "" +msgstr "Saprawdzanie wymagań wtyczki..." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439 @@ -13920,10 +14046,10 @@ #, java-format msgid "Click to delete the plugin ''{0}''" -msgstr "" +msgstr "Kliknij aby usunąć wtyczkę ''{0}''" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811 msgid "Keep plugin" -msgstr "" +msgstr "Zachowaj wtyczkę" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715 @@ -13931,5 +14057,5 @@ #, java-format msgid "Click to keep the plugin ''{0}''" -msgstr "" +msgstr "Kliknij aby zachować wtyczkę \"{0}\"" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789 @@ -13956,5 +14082,5 @@ #, java-format msgid "Click to disable the plugin ''{0}''" -msgstr "" +msgstr "Kliknij aby zablokować wtyczkę ''{0}''" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820 @@ -14014,5 +14140,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237 msgid "More info..." -msgstr "" +msgstr "Wiecej informacji..." #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42 @@ -14057,11 +14183,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14070,16 +14196,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14088,5 +14214,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14131,4 +14257,6 @@ "sure you have updated to the latest version of JOSM here:" msgstr "" +"Napotkałeś błąd w JOSM. Zanim zgłosisz błąd upewnij się że posiadasz " +"najnowszą wersję JOSM dostępną tutaj:" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127 @@ -14137,4 +14265,6 @@ "bug report in our bugtracker using this link:" msgstr "" +"Powinieneś także zaktualizować swoje wtyczki. Jeśli żadna z tych sugestii " +"nie pomaga prosimy o zgłoszenie błędu w naszym systemie za pomocą tego linku:" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131 @@ -14269,4 +14399,6 @@ "already been closed on {1}." msgstr "" +"Wysyłanie do zestawu zmian {0} zakończone " +"niepowodzeniem
ponieważ został on już zamknięty {1}." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 @@ -14349,5 +14481,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14399,5 +14531,5 @@ #: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:55 msgid "unused" -msgstr "" +msgstr "nieużywane" #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451 @@ -15068,14 +15200,14 @@ msgstr "Budynki" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15107,5 +15239,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15162,5 +15294,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15168,5 +15300,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15175,5 +15307,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -15181,17 +15313,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Kataster" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15200,13 +15332,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15231,13 +15363,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15293,5 +15429,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15302,13 +15438,13 @@ msgstr "woda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15356,5 +15492,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15362,26 +15498,26 @@ msgstr "adres" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15393,18 +15529,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS katastru francuskiego" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15412,5 +15548,5 @@ msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15418,127 +15554,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15546,5 +15687,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15935,4 +16076,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Pobierz obiekt…" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Pobierz wszystkich członków zaznaczonej relacji" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Pobierz teraz" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Należy wybrać przynajmniej jeden element do pobrania" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Test {0}/{1}: Rozpoczynanie {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Wczytywanie {0}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16022,5 +16198,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16103,5 +16279,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Odśwież" @@ -16644,30 +16820,31 @@ msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16695,13 +16872,13 @@ #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:21 msgid "Create multipolygon" -msgstr "" +msgstr "Utwórz wielokąt złożony" #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 msgid "Create multipolygon." -msgstr "" +msgstr "Tworzy wielokąt złożony" #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:120 msgid "Multipolygon must consist only of closed ways." -msgstr "" +msgstr "Wielokąt złożony musi sosiadać tylko zamknięte drogi." #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:140 @@ -16783,13 +16960,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17017,5 +17194,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55 msgid "Drag to move the picture" -msgstr "Przesuwa obraz" +msgstr "Przeciągnij aby przesunąć obraz" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42 @@ -17069,9 +17246,9 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44 msgid "Scale" -msgstr "Resetuj skalę" +msgstr "Skalę" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44 msgid "Resets picture scale" -msgstr "" +msgstr "Resetuje skalę obrazu" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54 @@ -17081,13 +17258,13 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54 msgid "Drag to rotate the picture" -msgstr "" +msgstr "Przeciągnij aby obrócić obraz" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52 msgid "Save Picture Calibration..." -msgstr "" +msgstr "Zapisz kalibrację..." #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52 msgid "Saves calibration data to a file" -msgstr "" +msgstr "Zapisuje kalibrację obrazu do pliku" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81 @@ -17106,5 +17283,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41 msgid "Drag to scale the picture in the X Axis" -msgstr "" +msgstr "Przeciągnij aby skalować obraz w osi X" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41 @@ -17114,5 +17291,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41 msgid "Drag to scale the picture in the X and Y Axis" -msgstr "" +msgstr "Przeciągnij aby skalować obraz w osi X i Y" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41 @@ -17122,5 +17299,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41 msgid "Drag to scale the picture in the Y Axis" -msgstr "" +msgstr "Przeciągnij aby skalować obraz w osi Y" #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 @@ -17293,9 +17470,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17338,5 +17510,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17348,5 +17520,5 @@ #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53 msgid "Add tags by clicking on road signs" -msgstr "" +msgstr "Dodaje do drogi tagi znaków drogowych" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54 @@ -17364,10 +17536,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -17862,9 +18034,9 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90 msgid "Create/Edit turn restriction..." -msgstr "" +msgstr "Utwórz/Edytuj ograniczenia skrętu..." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92 msgid "Create or edit a turn restriction." -msgstr "" +msgstr "Utwórz lub edytuj ograniczenia skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:42 @@ -17882,17 +18054,17 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54 msgid "Type:" -msgstr "" +msgstr "Typ:" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64 msgid "From:" -msgstr "" +msgstr "Z:" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75 msgid "To:" -msgstr "" +msgstr "Do:" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86 msgid "Vias:" -msgstr "" +msgstr "Przez:" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123 @@ -17931,5 +18103,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134 msgid "Edit basic attributes of a turn restriction" -msgstr "" +msgstr "Edytuj podstawowe atrybuty ograniczenia skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138 @@ -17939,24 +18111,24 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141 msgid "Errors/Warnings" -msgstr "" +msgstr "Błędy/Uwagi" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:142 msgid "Show errors and warnings related to this turn restriction" -msgstr "" +msgstr "Pokazuje błędy i uwagi zwiazane z tym ograniczeniem skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:280 #, java-format msgid "Create a new turn restriction in layer ''{0}''" -msgstr "" +msgstr "Tworzenie nowego ograniczenia skrętu na warstwie \"{0}\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:282 #, java-format msgid "Edit a new turn restriction in layer ''{0}''" -msgstr "" +msgstr "Edycja nowego ograniczenia skrętu na warstwie \"{0}\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:284 #, java-format msgid "Edit turn restriction ''{0}'' in layer ''{1}''" -msgstr "" +msgstr "Edycja ograniczenia skrętu \"{0}\" na warstwie \"{1}\"" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:398 @@ -18058,5 +18230,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select this turn restriction" -msgstr "" +msgstr "Zaznacz to ograniczenie skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810 @@ -18084,5 +18256,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147 msgid "please select a way" -msgstr "" +msgstr "proszę wybrać drogę" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:158 @@ -18093,5 +18265,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245 msgid "Delete from turn restriction" -msgstr "" +msgstr "Usuwa z ograniczenia skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:354 @@ -18109,29 +18281,29 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:11 msgid "No Right Turn" -msgstr "" +msgstr "Zakaz skrętu w prawo" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:12 msgid "No Left Turn" -msgstr "" +msgstr "Zakaz skrętu w lewo" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:13 msgid "No U-Turn" -msgstr "" +msgstr "Zakaz zawracania" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:14 msgid "No Straight On" -msgstr "" +msgstr "Zakaz jazdy prosto" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:15 msgid "Only Right Turn" -msgstr "" +msgstr "Nakaz skrętu w prawo" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:16 msgid "Only Left Turn" -msgstr "" +msgstr "Nakaz skrętu w lewo" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:17 msgid "Only Straight On" -msgstr "" +msgstr "Nakaz jazdy prosto" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:34 @@ -18142,5 +18314,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75 msgid "please select a turn restriction type" -msgstr "" +msgstr "proszę wybrać typ ograniczenia skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59 @@ -18152,21 +18324,21 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82 msgid "Public Service Vehicles" -msgstr "" +msgstr "Pojazdy transportu publicznego" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83 msgid "Public service vehicles like buses, tramways, etc." -msgstr "" +msgstr "Pojazdy transportu publicznego takie jak autobusy, tramwaje, itp." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95 msgid "Heavy Goods Vehicles" -msgstr "" +msgstr "Samochody ciężarowe" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:108 msgid "Motorcars" -msgstr "" +msgstr "Samochody osobowe" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:122 msgid "Bicycles" -msgstr "" +msgstr "Rowery" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193 @@ -18243,13 +18415,13 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:164 msgid "Display and manage turn restrictions in the current data set" -msgstr "" +msgstr "Wyświetla i zarządza ograniczeniami skrętu w aktualnym zestawie danych" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217 msgid "Open an editor for the selected turn restricion" -msgstr "" +msgstr "Otwiera okno edycji dla wybranego ograniczenia skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276 msgid "Delete the selected turn restriction" -msgstr "" +msgstr "Usuwa wybrane ograniczenie skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:314 @@ -18259,5 +18431,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:353 msgid "Set the current JOSM selection to the selected turn restrictions" -msgstr "" +msgstr "Ustawia zaznaczenie dla wybranego ograniczenia skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:355 @@ -18267,5 +18439,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:386 msgid "Zoom to the currently selected turn restrictions" -msgstr "" +msgstr "Powiększa do obecnie wybranego ograniczenia skrętu" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57 @@ -18547,47 +18719,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18825,14 +18997,50 @@ msgstr "Przecinające się drogi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Powielone węzły" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Powielone węzły" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Powielone węzły" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Powielone węzły" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Powielone węzły" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Powielone węzły" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Powielone węzły" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Węzły w tym samym miejscu" @@ -18985,59 +19193,59 @@ msgstr "Nakładające się drogi" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "Nieustalony rodzaj relacji" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "Problem z weryfikacją roli" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19474,5 +19682,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:96 msgid "Unnamed junction" -msgstr "Skrzyżowanie naz nazwy" +msgstr "Skrzyżowanie bez nazwy" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 @@ -19898,55 +20106,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Pobierz widoczne kafle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Zmień rozdzielczość" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Wczytaj ponownie błędne kafle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Kanał alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Zapisz warstwę WMS do pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Zapisz plik" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Otwórz warstwę WMS z pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Otwórz warstwę WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nieosługiwana wersja pliku WMS; znaleziono {0}, oczekiwano {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Błędny format pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Błąd podczas ładowania pliku" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Ustaw zakładkę WMS" @@ -20087,398 +20295,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "granica" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "elementy" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "linia główna" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Utwórz wielokąt złożony" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Sieć" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "mapy komunikacji miejskiej" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Ograniczenie" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "droga" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "miejsce" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "szlak wodny" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Aktualizuj" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20495,5 +20598,5 @@ #: build/trans_plugins.java:6 msgid "Tools for drawing buildings." -msgstr "" +msgstr "Narzedzie do rysowania budynków." #. Plugin cadastre-fr @@ -20535,11 +20638,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Pobierz dane OSM wzdłuż tej ścieżki" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20548,20 +20657,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20571,10 +20680,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20582,5 +20691,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20590,22 +20699,24 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " "relation editor." msgstr "" +"Tworzy wielokąty złożone jednym kliknięciem, łatwiej niż w standardowy " +"sposób z użyciem edytora relacji." #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20615,15 +20726,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje zgłoszone problemy z OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20631,5 +20742,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20637,5 +20748,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20644,5 +20755,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20651,10 +20762,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20662,15 +20773,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." -msgstr "" +msgstr "Pozwala wysyłać innym aplikaciom polecenia do JOSM" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20680,5 +20791,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20687,10 +20798,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20699,5 +20810,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20706,15 +20817,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20724,10 +20835,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20736,5 +20847,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20743,5 +20854,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20750,10 +20861,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20762,5 +20873,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20770,5 +20881,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20779,15 +20890,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20796,5 +20907,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22861,5 +22972,5 @@ #: build/trans_presets.java:932 msgid "Allowed traffic:" -msgstr "" +msgstr "Dozwolony ruch:" #. item "Barriers/Bollard" check "Motorcycle" @@ -23672,5 +23783,5 @@ #: build/trans_presets.java:1238 msgid "16.7" -msgstr "" +msgstr "16.7" #. @@ -24374,5 +24485,5 @@ #: build/trans_presets.java:1398 msgid "Sharing" -msgstr "" +msgstr "wypożyczalnia" #. item "Car/Sharing" @@ -24380,5 +24491,5 @@ #: build/trans_presets.java:1400 msgid "Edit Car Sharing" -msgstr "" +msgstr "Edytuj wypożyczalnię samochodów" #. item "Bicycle/Parking" @@ -27108,19 +27219,19 @@ #: build/trans_presets.java:2342 msgid "Tower type" -msgstr "" +msgstr "Typ wieży" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2342 msgid "communication" -msgstr "" +msgstr "komunikacyjna" #: build/trans_presets.java:2342 msgid "observation" -msgstr "" +msgstr "obserwacyjna" #. #: build/trans_presets.java:2344 msgid "Height (meters)" -msgstr "" +msgstr "Wysokość (metry)" #. item "Man Made/Tower" text "Operator" @@ -27389,8 +27500,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "linia główna" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "linia boczna" @@ -32754,4 +32869,177 @@ msgstr "Plaża" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "droga" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "granica" + #. color deprecated #. @@ -33270,4 +33558,7 @@ msgstr "Sycylia - Włochy" +#~ msgid "closedway" +#~ msgstr "zamknięta droga" + #~ msgid "Move" #~ msgstr "Przenieś" @@ -33461,7 +33752,4 @@ #~ msgid "No data imported." #~ msgstr "Nie zaimportowano danych." - -#~ msgid "Error while loading page {0}" -#~ msgstr "Błąd w czasie ładowania strony {0}" #~ msgid "Open in Browser" @@ -33924,7 +34212,4 @@ #~ msgid "Board Type" #~ msgstr "Rodzaj tablicy" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Należy wybrać przynajmniej jeden element do pobrania" #~ msgid "" Index: applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- applications/editors/josm/i18n/po/pt_BR.po (revision 22464) +++ applications/editors/josm/i18n/po/pt_BR.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-08 17:59+0000\n" -"Last-Translator: Rodrigo de Avila \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-28 03:08+0000\n" +"Last-Translator: Guilherme Donadel \n" "Language-Team: Brazilian Portuguese \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: 2010-07-11 18:51+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Ajuda" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ "Parâmetro \"downloadgps\" não aceita nomes de arquivos ou URLs de arquivos." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -238,8 +238,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -249,13 +249,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -271,5 +272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -278,5 +279,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -293,13 +295,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Cancelar" @@ -360,11 +362,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -411,6 +413,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -438,5 +441,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -456,5 +459,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Information" -msgstr "Informações" +msgstr "Informação" #. Do it! @@ -560,5 +563,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -622,6 +625,6 @@ msgstr "Por favor selecione no mínimo 2 caminhos a combinar" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -630,9 +633,9 @@ msgstr "Copiar" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Copiar objetos selecionados para memória de colagem" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Por favor selecione algo a ser copiado" @@ -667,6 +670,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -735,5 +738,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separar camadas" @@ -754,5 +757,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Tipo de objeto:" @@ -763,5 +766,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID do objeto:" @@ -807,5 +810,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicar" @@ -954,25 +957,25 @@ msgstr "Não foi encontrada intersecção. Nada foi alterado." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Nó adicionado em todas intersecções" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Eliminar caminhos que não fazem parte de um multipolígono interior" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Consertar relações" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Fundir área sobreposta consigo mesma" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Fundir áreas sobrepostas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -982,33 +985,33 @@ "verifique se não foram introduzidos erros." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Entrada de valores para todos conflitos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Resolver conflitos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Consertar conflito de etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Eliminar elementos de relações" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Juntas Áreas: Remover Caminhos Curtos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Vía Fechada" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Eliminar etiquetas de caminhos internos" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Função Juntar Áreas" @@ -1027,5 +1030,5 @@ msgstr "Unir Nó e Linha" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Sem atalho" @@ -1395,6 +1398,6 @@ "Por favor selecione caminhos com ângulos de aproximadamente 90 ou 180 graus." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1405,17 +1408,17 @@ msgstr "Colar" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Colar conteúdo da memória" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Apagar membros incompletos?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Colar sem membros incompletos" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1426,10 +1429,10 @@ "primitivas incompletas. Deseja colar os dados sem as primitivas incompletas?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Colar Tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1437,5 +1440,5 @@ "selecionados." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1444,5 +1447,5 @@ msgstr[1] "A colar {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1511,5 +1514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1520,12 +1523,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1552,6 +1555,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Erro" @@ -1579,5 +1582,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Salvar" @@ -2003,4 +2006,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Dados baixados" @@ -2490,4 +2494,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2654,5 +2659,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." -msgstr "" +msgstr "Também incluir na busca objetos incompletos ou apagados" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 @@ -2820,5 +2825,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filtro" @@ -2844,8 +2849,11 @@ " {0}" msgstr "" +"Expressão de busca não é válida: \n" +"\n" +" {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 msgid "Invalid search expression" -msgstr "" +msgstr "Expressão de busca inválida" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -2896,5 +2904,5 @@ msgctxt "search" msgid "A" -msgstr "" +msgstr "A" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 @@ -3032,5 +3040,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3051,9 +3059,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "Aceitar" @@ -3156,5 +3164,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Conflito duplo" @@ -3252,5 +3260,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3264,5 +3272,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Apagar confirmação" @@ -3275,4 +3283,7 @@ "because you don't see the real object.
Do you really want to delete?" msgstr "" +"Você está a ponto de apagar objetos incompletos.
Isto irá causar " +"problemas porque você não enxerga o objeto real.
Está seguro que quer " +"apagar?" #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42 @@ -3450,11 +3461,42 @@ msgstr "Propriedades de " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Regras em relações referentes a" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Correção automática de tags" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Erro ao carregar página {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3682,5 +3724,5 @@ msgstr "L" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3690,5 +3732,5 @@ "incluída" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3732,5 +3774,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3777,6 +3819,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3788,5 +3829,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3798,7 +3838,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3997,13 +4036,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Guyane RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 msgid "UTM France (DOM)" -msgstr "" +msgstr "UTM França (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 msgid "UTM Geodesic system" -msgstr "" +msgstr "Sistema Geodésico UTM" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4023,7 +4062,7 @@ msgstr "Não mostrar novamente (lembrar escolha)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4031,29 +4070,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incompleto" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "rodovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "ferrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "hidrovia" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "uso da terra" @@ -4061,7 +4100,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4073,5 +4112,5 @@ msgstr[1] "{0} nós" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "transporte public" @@ -4130,6 +4169,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4137,6 +4176,6 @@ msgstr "prédio" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4145,5 +4184,5 @@ msgstr[1] "{0} membros" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4218,5 +4257,5 @@ msgstr "Objeto apagado" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4318,29 +4357,29 @@ msgstr "Senha" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "uso" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "opções" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Mostar essa ajuda" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Argumento padrão de geometria unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Baixar o retângulo limite" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" @@ -4348,41 +4387,41 @@ "Abrir)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Baixar o retângulo limite como dados de gps brutos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z) como dados raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Selecionar dentro da busca" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Executar em modo maximizado" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Resetar preferência para default" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Definir o idioma" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "opções providas como propriedades do sistema Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/TRILHA/PARA/PASTA/DO/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Alterar o diretório para todas as configurações de usuário" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4396,9 +4435,9 @@ "megabytes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "exemplos" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4408,46 +4447,62 @@ "ordem." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Tenha certeza de que irá carregar algum dado, caso use --selection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Inicializando" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Atualizando plugins..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Instalando plugins atualizados" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Carregando plugins anteriores" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Aplicando padrão" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Criando tela principal" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Carregando plugins" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Resolver" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Configuração {0} das preferências foi removida pois não é mais usada." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Arquivo" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4466,10 +4521,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4477,10 +4532,11 @@ msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Predefinições" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4491,5 +4547,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Audio" @@ -4772,5 +4828,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4788,5 +4844,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5014,5 +5070,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Acima" @@ -5241,6 +5297,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5255,6 +5311,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5315,17 +5371,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Cancelar resolução de conflito" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Aplicar conflitos resolvidos" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5397,20 +5453,22 @@ msgstr "Conflitos em etiquetas coladas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Colar ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "De ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "Para ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5419,5 +5477,5 @@ msgstr[1] "{0} etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5429,5 +5487,5 @@ msgstr[1] "{0} caminhos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5496,5 +5554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Valor:" @@ -5621,5 +5679,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Detalhes" @@ -5808,5 +5866,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57 msgid "Error in filter" -msgstr "" +msgstr "Erro no filtro" #. translators notes must be in front @@ -6033,5 +6091,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição" @@ -6114,5 +6172,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6327,5 +6385,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Aberto" @@ -7182,5 +7240,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7810,5 +7868,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7935,9 +7993,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:64 msgid "Download relation members" -msgstr "Daixar membros da relação" +msgstr "Baixar membros da relação" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7996,26 +8054,26 @@ msgstr "({0}/{1}): Baixando relação ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Tags e Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Relações de parentesco" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Relações-filho" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Aplicar papel:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Informe um papel e o aplique-o aos membros selecionados da relação." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8027,14 +8085,14 @@ "deseja proceder em relação a dependências circulares?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Apagá-los, limpar relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorá-los, deixar relação como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8046,9 +8104,9 @@ "\"{0}\"

Você realmente deseja adicionar outro membro à relação?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Múltiplos membros referenciando a mesma primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8061,5 +8119,5 @@ "\"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8068,5 +8126,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8075,5 +8133,5 @@ "membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8083,5 +8141,5 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8091,15 +8149,15 @@ "membro selecionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove todos os membros referentes ao um dos primitivos selecionados" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor de Relações: Remover Selecionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" @@ -8107,5 +8165,5 @@ "Selecionar membros da relação que referenciam primitivas na seleção atual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8115,64 +8173,64 @@ "Selecionar membros da relação que referenciam {0} primitivas na seleção atual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Selecione primitivas para as relações de membros selecionadas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Classificar a relação de membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Classificar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor de Relações: Classificar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Reverter a ordem dos membros da relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Inverter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor de Relações: Inverter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Mover os membros selecionados para cima" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor de Relações: Mover para cima" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Mover membros selecionados para baixo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor de Relações: Mover para Baixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Remover os membros atualmente selecionados dessa relação" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor de Relações: Remover" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Apagar a relação editada atual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8183,19 +8241,19 @@ "relações estava aberto. Eles foram removidos da lista de membros da relação." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Sim, crie um conflito e feche" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Clique para criar um conflito e fechar este editor de relações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Não, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8203,5 +8261,5 @@ "relação." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8213,5 +8271,5 @@ "fechar o editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8222,50 +8280,50 @@ "
Por favor, primeiro resolva esse conflito e então tente de novo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Aplciar as atualizações correntes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Aplicar atualizações e fechar aviso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Cancelar atualizações e fechar janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Adicionar uma tag vazia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Baixar todos os membros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Baixar membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor de Relações: Baixar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Baixar membros incompletos selecionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Definir uma papel para membros selecionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Aplicar papel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8274,27 +8332,33 @@ msgstr[1] "Você está escolhendo um papel vazio em {0} primitivas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Isso é igual a remover os papéis dessas primitivas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Você quer mesmo aplicar a nova regra?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Sim, aplique" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Não, não aplicar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Confirme papel vazio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Editar relação referente à relação selecionada atualmente" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8643,5 +8707,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -8736,4 +8800,6 @@ "network problem, please check
your internet connection" msgstr "" +"Falha ao abrir página de ajuda para url {0}.
Isto deve ter " +"acontecido por problemas de rede,
por favor, cheque sua conexão" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 @@ -8836,4 +8902,6 @@ "Failed to set reference. Reference ID {0} does not match history ID {1}." msgstr "" +"Falha ao definir referência. ID de referência {0} não combina com ID do " +"histórico {1}." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277 @@ -8983,4 +9051,6 @@ "include such a primitive" msgstr "" +"Falha ao atualizar primitiva com id {0}, porque a camada de edição atual não " +"inclui esta primitiva" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 @@ -9124,4 +9194,6 @@ "the changeset after the next upload." msgstr "" +"Por favor, escolha para qual conjunto de modificações serão enviados os " +"dados, e se o conjunto deverá ser fechado depois do próximo envio." #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:89 @@ -9228,4 +9300,6 @@ "and a valid password." msgstr "" +"Autenticação na API do OSM \"{0}\" falhou. Por favor, entre um login e senha " +"válidos." #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 @@ -9387,5 +9461,9 @@ "discard the modifications.
Layers with conflicts:" msgstr[0] "" +"{0} camada tem conflitos não-resolvidos.
Resolva-os ou descarte as " +"modificações.
Camada com conflitos:" msgstr[1] "" +"{0} camadas tem conflitos não-resolvidos.
Resolva-os ou descarte as " +"modificações.
Camadas com conflitos:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206 @@ -9403,5 +9481,11 @@ "html>" msgstr[0] "" +"{0} camada necessita ser salva, mas não tem arquivo associado." +"
Selecione um arquivo para esta camada ou descarte as modificações." +"
Camada sem arquivo:" msgstr[1] "" +"{0} camadas necessitam ser salvas, mas não tem arquivo associado." +"
Selecione um arquivo para cada camada ou descarte as modificações." +"
Camadas sem arquivo:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224 @@ -9420,5 +9504,11 @@ "changes.
Layers with non-writable files:" msgstr[0] "" +"{0} camada necessita ser salva, mas o arquivo associado
não pode " +"ser escrito.
Selecione outro arquivo ou descarte as modificações." +"
Camada com arquivo não-gravável:" msgstr[1] "" +"{0} camadas necessitam ser salvas, mas os arquivos associados
não " +"podem ser escritos.
Selecione outro arquivo para cada camada ou descarte " +"as modificações.
Camada com arquivo não-gravável:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244 @@ -9478,5 +9568,9 @@ "cancelled or have failed." msgstr[0] "" +"Uma operação de envio e/ou salvamento em uma camada com " +"modificações
foi cancelada ou falhou." msgstr[1] "" +"Operações de envio e/ou salvamento de {0} camadas com " +"modificações
foram canceladas ou falharam." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500 @@ -10172,12 +10266,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Descarregar do OSM ao largo desta via" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Descargar tudo entre:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10185,8 +10283,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Área máxima por pedio:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10195,19 +10295,20 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898 msgid "Download near:" -msgstr "" +msgstr "Baixar próximo:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899 msgid "track only" -msgstr "" +msgstr "somente trilha" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899 msgid "waypoints only" -msgstr "" +msgstr "somente pontos" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899 msgid "track and waypoints" -msgstr "" +msgstr "trilhas e pontos" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10643,10 +10744,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Remover arquivo de imagem do disco" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10655,5 +10756,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "O arquivo de imagem não pode ser removido." @@ -11853,5 +11954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60 msgid "Create markers when reading GPX." -msgstr "" +msgstr "Criar marcadores quando ler um arquivo GPX." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69 @@ -12397,5 +12498,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30 msgid "Changing keyboard shortcuts manually." -msgstr "" +msgstr "Alterando os atalhos de teclado manualmente." #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43 @@ -12488,5 +12589,5 @@ #, java-format msgid "Loading style sources from ''{0}''" -msgstr "" +msgstr "Carregando fontes de estilos a partir de ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:743 @@ -12605,5 +12706,5 @@ #, java-format msgid "{0}: Version {1} (local: {2})" -msgstr "" +msgstr "{0}: Versão {1} (versão instalada: {2})" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:72 @@ -12924,5 +13025,5 @@ msgstr "Adicionar nova tag" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12931,53 +13032,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Mais informações sobre esta característica" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "elementos" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Atributos opcionais:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "via sem saída" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Tipo desconhecido: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12987,15 +13084,15 @@ msgstr "Não foi possível ler a fonte de preferência de tags: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Erro analisando {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementos do tipo {0} são suportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13005,18 +13102,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nada selecionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Seleção inadequada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Aplicar Preferência" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Alterar propriedades" @@ -13031,4 +13128,28 @@ msgid "Preset group {0}" msgstr "Grupo de pré-definições {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Pesquisar: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Procure por objetos" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Mostra o nome traduzido nas listas de seleção" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Pesquisar: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13615,5 +13736,5 @@ #, java-format msgid "Missing mandatory attribute ''{0}''." -msgstr "" +msgstr "Faltando atributo mandatório ''{0}'." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:79 @@ -13625,4 +13746,5 @@ "Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''." msgstr "" +"Valor ilegal para atributo mandatório ''{0}'' do tipo long. Obtido ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:82 @@ -13635,4 +13757,6 @@ "''{1}''." msgstr "" +"Valor ilegal para atributo mandatório ''{0}'' do tipo long (>=0). Obtido " +"''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:112 @@ -13642,4 +13766,5 @@ "Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''." msgstr "" +"Valor ilegal para atributo mandatório ''{0}'' do tipo double. Obtido ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139 @@ -13649,4 +13774,6 @@ "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''." msgstr "" +"Valor ilegal para atributo mandatório ''{0}'' do tipo boolean. Obtido " +"''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150 @@ -13662,4 +13789,6 @@ "''{1}''." msgstr "" +"Valor ilegal para atributo mandatório ''{0}'' do tipo OsmPrimitiveType. " +"Obtido ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231 @@ -13740,5 +13869,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13750,10 +13879,10 @@ msgstr "Arquivos do servidor OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13762,5 +13891,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14446,5 +14575,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237 msgid "More info..." -msgstr "" +msgstr "Mais informações..." #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42 @@ -14489,11 +14618,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Baixando lista de plugins a partir de \"{0}\"" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14502,16 +14631,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14522,5 +14651,5 @@ "este site. A exceção foi: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14790,5 +14919,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15521,14 +15650,14 @@ msgstr "Construções" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Rua" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15560,5 +15689,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15615,5 +15744,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15621,5 +15750,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15628,5 +15757,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Escolha entre..." @@ -15634,17 +15763,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15653,13 +15782,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15686,13 +15815,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgstr "Selecionar a primeira camada WMS da lista." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15748,5 +15881,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15757,13 +15890,13 @@ msgstr "água" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "símbolo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "encomenda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "número da encomenda" @@ -15811,5 +15944,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15817,26 +15950,26 @@ msgstr "endereço" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15848,18 +15981,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS do cadastre Francese" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Fonte" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15867,5 +16000,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15873,9 +16006,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Permitir empilhamento de camadas múltiplas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -15883,125 +16016,132 @@ "esquerda é mais transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Resolução da imagem:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Resolução alta (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Resolução média (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Resolução baixa (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilinear (rápido)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bicúbica (lenta)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Camadas:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Encomendas." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +"Automaticamente seleciona a primeira camada WMS se múltiplas camadas " +"existirem quando se faz a seleção." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16275,4 +16415,6 @@ "Select one of them first, then retry" msgstr "" +"Existe mais de uma camada WMS\n" +"Primeiro selecione uma delas, então repita" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96 @@ -16285,5 +16427,5 @@ #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" -msgstr "" +msgstr "Camada WMS ({0}), {1} imagem(ns) carregadas" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247 @@ -16394,4 +16536,39 @@ msgid "TCX Files (*.tcx)" msgstr "Arcivo TCX (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Baixar objeto..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Baixar dados do mapa no fim da via selecionada" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Baixar agora" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Por favor selecione no mínimo uma tarefa para baixar" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Teste {0}/{1}: Iniciando {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Carregando {0}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16481,5 +16658,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16562,5 +16739,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Atualizar" @@ -16870,5 +17047,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62 msgid "WMS Layer" -msgstr "" +msgstr "Camada WMS" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64 @@ -17019,5 +17196,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90 msgid "Capture GPS Track" -msgstr "" +msgstr "Capturar trilha GPS" #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56 @@ -17028,5 +17205,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72 msgid "Center Once" -msgstr "" +msgstr "Centralizar" #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70 @@ -17036,5 +17213,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86 msgid "Auto-Center" -msgstr "" +msgstr "Centralizar automaticamente" #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88 @@ -17103,30 +17280,31 @@ msgstr "Medições" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -17222,5 +17400,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:113 msgid "Opens the OpenStreetBugs window and activates the automatic download" -msgstr "" +msgstr "Abre a janela do OpenStreetBugs e ativa o download automático" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:119 @@ -17238,13 +17416,13 @@ msgstr "Fila" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "offline" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "online" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17466,5 +17644,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55 msgid "PicLayer move" -msgstr "" +msgstr "Mover PicLayer" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55 @@ -17474,5 +17652,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42 msgid "New picture layer from clipboard" -msgstr "" +msgstr "Nova camada de imagem a partir da área de transferência" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64 @@ -17482,5 +17660,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73 msgid "New picture layer from file..." -msgstr "" +msgstr "Nova camada de imagem a partir do arquivo..." #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124 @@ -17502,5 +17680,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65 msgid "PicLayer" -msgstr "" +msgstr "PicLayer" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44 @@ -17530,5 +17708,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54 msgid "PicLayer rotate" -msgstr "" +msgstr "Rotacionar PicLayer" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54 @@ -17546,5 +17724,5 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81 msgid "JOSM PicLayer plugin calibration data" -msgstr "" +msgstr "Dados de calibração do plugin JOSM PicLayer" #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85 @@ -17751,9 +17929,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17796,5 +17969,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17822,10 +17995,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19040,47 +19213,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19315,14 +19488,50 @@ msgstr "Vias que se cruzam" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Nós duplicados" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Este teste verifica se não há nós na mesma posição." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Unir nós duplicados?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Nós duplicados" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Nós duplicados" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Unir nós duplicados?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Nós duplicados" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Unir nós duplicados?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Nós na mesma posição" @@ -19479,59 +19688,59 @@ msgstr "Vias Sobrepostas" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20266,5 +20475,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107 msgid "Custom WMS Link" -msgstr "" +msgstr "Link WMS customizado" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 @@ -20274,5 +20483,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 msgid "Visit Homepage" -msgstr "" +msgstr "Visite o site" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145 @@ -20301,5 +20510,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 msgid "Please select the WMS layer to adjust." -msgstr "" +msgstr "Por favor selecionea camada WMS para ajustar." #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 @@ -20313,5 +20522,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 msgid "There are currently no WMS layer to adjust." -msgstr "" +msgstr "Atualmente não há nenhuma camada WMS para ajustar." #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 @@ -20351,5 +20560,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63 msgid "Automatic downloading" -msgstr "" +msgstr "Download automático" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107 @@ -20389,57 +20598,57 @@ msgstr "URL inválido?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Baixar imagens visíveis" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Mudar resolução" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" -msgstr "" - -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +msgstr "Recarregar imagens erradas" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Canal alfa" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Salvar camada WMS para arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Salvar camada WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Carregar camada WMS de um arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Carregar camada WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Erro no formato do arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Erro ao carregar arquivo" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" -msgstr "" +msgstr "Adicionar marcador para esta camada WMS" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180 @@ -20449,5 +20658,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193 msgid "Open a blank WMS layer to load data from a file" -msgstr "" +msgstr "Abrir uma camada WMS em branco para carregar dados de um arquivo" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44 @@ -20580,398 +20789,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "limite" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Incremento" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "linha de transmissão" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolígono" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Rede" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "transporte public" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Restrição" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "rota" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Colar" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "hidrovia" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Atualizar" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20983,4 +21087,7 @@ "option to automatically generate individual house number nodes from a Way." msgstr "" +"Agrupa entradas comuns de Interpolação de Endereços em uma única janela, " +"assim como as opções para gerar automaticamente nós com números de casas " +"individuais a partir de um caminho." #. File ../plugins/alignways/build.xml had no data @@ -21008,5 +21115,5 @@ #: build/trans_plugins.java:12 msgid "Create a grid of ways." -msgstr "" +msgstr "Cria uma grade de caminhos." #. Plugin czechaddress @@ -21019,5 +21126,5 @@ #: build/trans_plugins.java:16 msgid "Allows to import various file formats into JOSM directly." -msgstr "" +msgstr "Permite importar vários formatos de arquivos diretamente no JOSM." #. Plugin DirectUpload @@ -21027,12 +21134,20 @@ "openstreetmap.org." msgstr "" +"Este plugin envia trilhas GPS diretamente da camada ativa do JOSM para o " +"openstreetmap.org." + +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Descarregar do OSM ao largo desta via" #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Duplicar vias com um Offset" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21043,20 +21158,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21066,16 +21181,18 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." msgstr "" +"Suporta entrada de dados GPS ao vivo (ponto deslocável) através de uma " +"conexão com um servidor gpsd." #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21085,15 +21202,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21102,5 +21219,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21110,15 +21227,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Mostrar imagens de fundo do OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importar problemas do OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21126,5 +21243,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21132,5 +21249,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21141,17 +21258,19 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " "align it with the map." msgstr "" +"Este plugin permite exibir qualquer imagem como plano de fundo do editor, e " +"alinhá-lo com o mapa." #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." -msgstr "" +msgstr "O grande pacote de itens de aparência JGoodies Plastic." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21159,15 +21278,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." -msgstr "" +msgstr "Permite que outros aplicativos enviem comandos para o JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21177,5 +21296,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21184,10 +21303,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Possibilita capacidade de roteamento." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21196,5 +21315,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21203,15 +21322,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21221,10 +21340,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21233,5 +21352,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21240,17 +21359,19 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " "restrictions in the OpenStreetMap database." msgstr "" +"O plugin turnrestrictions permite que se adicione informações sobre " +"restrições de conversão na base de dados do OpenStreetMap." #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21259,5 +21380,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21267,5 +21388,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21274,15 +21395,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21291,9 +21412,9 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." msgstr "" -"Mostrar imagens georeferenciadas como fundo no JOSM (servidores WMS, " +"Mostra imagens georeferenciadas como fundo no JOSM (servidores WMS, " "Yahoo, ...)." @@ -27886,10 +28007,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "linha de transmissão" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "online" #. item "Man Made/Power Line" combo "Voltage" @@ -33251,4 +33376,177 @@ msgstr "praia" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "rota" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "limite" + #. color deprecated #. @@ -33767,4 +34065,7 @@ msgstr "Sicilia - Italia" +#~ msgid "closedway" +#~ msgstr "via sem saída" + #~ msgid "Preparing..." #~ msgstr "Preparando..." @@ -34051,7 +34352,4 @@ #~ msgstr "Estes nós não estão em um círculo" -#~ msgid "Please select at least one task to download" -#~ msgstr "Por favor selecione no mínimo uma tarefa para baixar" - #~ msgid "JOSM Online Help" #~ msgstr "Ajuda Online do JOSM" @@ -34059,7 +34357,4 @@ #~ msgid "Can only edit help pages from JOSM Online Help" #~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM" - -#~ msgid "Error while loading page {0}" -#~ msgstr "Erro ao carregar página {0}" #~ msgid "History of Element" Index: applications/editors/josm/i18n/po/ro.po =================================================================== --- applications/editors/josm/i18n/po/ro.po (revision 22464) +++ applications/editors/josm/i18n/po/ro.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-09 09:37+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 20:17+0000\n" "Last-Translator: Dirk Stöcker \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: 2010-07-11 18:52+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -27,11 +27,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "_Ajutor" @@ -44,5 +44,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -75,7 +75,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -107,5 +107,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -232,8 +232,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -243,13 +243,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -265,5 +266,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -272,5 +273,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -287,13 +289,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Anulează" @@ -354,11 +356,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -405,6 +407,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -432,5 +435,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -554,5 +557,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -614,6 +617,6 @@ msgstr "Selectează te rog cel puţin două căi pentru a le combina." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -622,9 +625,9 @@ msgstr "Copiază" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Vă rugăm să selectaţi ceva pentru a copia" @@ -659,6 +662,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -727,5 +730,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Separă Strat" @@ -747,5 +750,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "" @@ -756,5 +759,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID-ul obiectului:" @@ -799,5 +802,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicare" @@ -945,25 +948,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -971,33 +974,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Introdu valori pentru toate conflictele." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Rezolvă Conflictele" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "" @@ -1016,5 +1019,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "" @@ -1359,6 +1362,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1369,17 +1372,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1388,14 +1391,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 +msgid "Paste Tags" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 -msgid "Paste Tags" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1404,5 +1407,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1471,5 +1474,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1480,12 +1483,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1512,6 +1515,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Eroare" @@ -1539,5 +1542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Salvează" @@ -1942,4 +1945,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "" @@ -2403,4 +2407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2703,5 +2708,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "" @@ -2896,5 +2901,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2915,9 +2920,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3018,5 +3023,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3110,5 +3115,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3119,5 +3124,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3301,10 +3306,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" msgstr "" @@ -3507,5 +3543,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3513,5 +3549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3551,5 +3587,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3590,6 +3626,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3602,5 +3637,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3613,7 +3647,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3831,7 +3864,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3839,29 +3872,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "incomplet" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 -msgid "highway" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +msgid "highway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 -msgid "waterway" -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +msgid "waterway" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "" @@ -3869,7 +3902,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3881,5 +3914,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3938,6 +3971,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3945,6 +3978,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3953,5 +3986,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4026,5 +4059,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4119,69 +4152,69 @@ msgstr "Parolă" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "utilizare" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "opţiuni" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Arată acest ajutor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Argument geometrie unix standard" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Descarcă perimetrul selectat" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Descarcă perimetrul selectat ca date gps neprelucrate" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "Selectează cu căutarea dată" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +msgid "Launch in maximized mode" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Reset the preferences to default" msgstr "Restabileşte preferinţele implicite" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4191,9 +4224,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "exemple" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4201,46 +4234,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Se creează interfața grafică" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Rezolvă" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4259,10 +4308,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Vizualizare" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4270,10 +4319,11 @@ msgstr "Unelte" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4284,5 +4334,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "" @@ -4549,5 +4599,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4565,5 +4615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4768,5 +4818,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "" @@ -4983,6 +5033,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -4997,6 +5047,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5057,17 +5107,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5138,20 +5188,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5160,5 +5212,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5170,5 +5222,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5234,5 +5286,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5336,5 +5388,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5740,5 +5792,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5821,5 +5873,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6021,5 +6073,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6872,5 +6924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7440,5 +7492,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7570,5 +7622,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7625,26 +7677,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7653,14 +7705,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7670,9 +7722,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7682,15 +7734,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7698,5 +7750,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7704,20 +7756,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7726,64 +7778,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7792,23 +7844,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7817,5 +7869,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7824,50 +7876,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7876,26 +7928,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8228,5 +8286,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9655,12 +9713,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9668,8 +9730,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9693,4 +9757,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10126,10 +10191,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10138,5 +10203,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12305,5 +12370,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12312,53 +12377,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12368,15 +12429,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Eroare la prelucrarea {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12387,18 +12448,18 @@ msgstr[2] "Schimb {0} de obiecte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Modificare proprietăţi" @@ -12413,4 +12474,27 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Căutare" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Caută obiecte" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +msgid "Show only applicable to selection" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Caută obiecte" #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13110,5 +13194,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13120,10 +13204,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13132,5 +13216,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13849,11 +13933,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13862,16 +13946,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13880,5 +13964,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14139,5 +14223,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14850,14 +14934,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14889,5 +14973,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -14944,5 +15028,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -14950,5 +15034,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -14957,5 +15041,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -14963,17 +15047,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -14982,13 +15066,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15013,13 +15097,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15075,5 +15163,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15084,13 +15172,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15138,5 +15226,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15144,26 +15232,26 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15175,18 +15263,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15194,5 +15282,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15200,127 +15288,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15328,5 +15421,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15717,4 +15810,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Descarc datele OSM..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Descarcă hărţi de la serverul OSM." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Descărcaţi obiect" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Selectează te rog cel puţin două căi pentru a le combina." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Citesc {0}..." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15804,5 +15932,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15885,5 +16013,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "" @@ -16426,30 +16554,31 @@ msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16561,13 +16690,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17069,9 +17198,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17114,5 +17238,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17140,10 +17264,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18323,47 +18447,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18597,14 +18721,44 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +msgid "Mixed type duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +msgid "Highway duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +msgid "Railway duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +msgid "Waterway duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +msgid "Boundary duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +msgid "Power duplicated nodes" +msgstr "" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18757,59 +18911,59 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19666,55 +19820,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Salvează strat WMS în fișier" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Salvează strat WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19855,398 +20009,285 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 -msgid "boundary" +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" msgstr "" #. relation type #: build/specialmessages.java:18 +msgctxt "Relation type" +msgid "boundary" +msgstr "" + +#. relation type +#: build/specialmessages.java:19 +msgctxt "Relation type" +msgid "enforcement" +msgstr "" + +#. relation type +#: build/specialmessages.java:20 +msgctxt "Relation type" +msgid "line" +msgstr "" + +#. relation type +#: build/specialmessages.java:21 +msgctxt "Relation type" msgid "multipolygon" msgstr "" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +msgctxt "Relation type" +msgid "network" +msgstr "" + +#. relation type +#: build/specialmessages.java:23 +msgctxt "Relation type" +msgid "public_transport" +msgstr "" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Contribuţii" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +msgstr "Despre" + +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +msgctxt "Relation type" +msgid "site" +msgstr "" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" +msgctxt "Relation type" +msgid "waterway" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 -msgid "Update" +msgid "Save in:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 +msgid "Update" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20303,11 +20344,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Descarc datele OSM..." + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20316,20 +20363,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20339,10 +20386,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20350,5 +20397,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20358,15 +20405,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20375,5 +20422,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20383,15 +20430,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20399,5 +20446,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20405,5 +20452,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20412,5 +20459,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20419,10 +20466,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20430,15 +20477,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20448,5 +20495,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20455,10 +20502,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20467,5 +20514,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20474,15 +20521,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20492,10 +20539,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20504,5 +20551,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20511,5 +20558,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20518,10 +20565,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20530,5 +20577,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20538,5 +20585,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20545,15 +20592,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20562,5 +20609,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27156,8 +27203,10 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +msgctxt "Power Line" msgid "line" msgstr "" #: build/trans_presets.java:2452 +msgctxt "Power Line" msgid "minor_line" msgstr "" @@ -32521,4 +32570,177 @@ msgstr "" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "" + #. color deprecated #. Index: applications/editors/josm/i18n/po/ru.po =================================================================== --- applications/editors/josm/i18n/po/ru.po (revision 22464) +++ applications/editors/josm/i18n/po/ru.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 17:21+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-15 10:25+0000\n" +"Last-Translator: Calibrator \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\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: 2010-07-11 18:51+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -26,11 +26,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Справка" @@ -43,5 +43,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -74,7 +74,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -106,5 +106,5 @@ msgstr "Параметр \"downloadgps\" не принимает имена или URL-адреса файлов" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -124,6 +124,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -238,8 +238,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -249,13 +249,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -271,5 +272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -278,5 +279,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -293,13 +295,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Отмена" @@ -362,11 +364,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -413,6 +415,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -440,5 +443,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -563,5 +566,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -625,6 +628,6 @@ msgstr "Выделите не менее двух линий для объединения." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -633,9 +636,9 @@ msgstr "Копировать" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Копировать выделенные объекты в буфер обмена." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Выделите что-нибудь для копирования." @@ -669,6 +672,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -737,5 +740,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "На отдельный слой" @@ -755,5 +758,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Тип объекта:" @@ -764,5 +767,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "ID объекта:" @@ -807,5 +810,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Дублировать" @@ -956,25 +959,25 @@ msgstr "Пересечений не найдено. Изменений сделано не было." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Добавлены точки на всех пересечениях" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Удалить линии, которые не являются внутренней частью мультиполигона" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Исправить отношения" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Присоединённая самоперекрывающаяся область" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Объединённые наложенные полигоны" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -984,33 +987,33 @@ "Пожалуйста, проверьте не появились ли ошибки." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Введите значения для всех конфликтов." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Уладить конфликты" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Уладить конфликты тегов" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Удалённый из отношений элемент" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Объединить полигоны: короткие линии удаляются" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Замкнутая линия" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Удалить теги у внутренних линий" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Функция объединения полигонов" @@ -1029,5 +1032,5 @@ msgstr "Включить точку в линию" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Нет ярлыка" @@ -1400,6 +1403,6 @@ msgstr "Пожалуйста, выделите линии с углами, близкими к 90 или 180 градусов." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1410,17 +1413,17 @@ msgstr "Вставить" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Вставить содержимое буфера." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Удалить неполных участников?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Вставить без неполных участников" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1432,14 +1435,14 @@ "элементов?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Вставить теги" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Применить теги из буфера ко всем выделенным объектам." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1449,5 +1452,5 @@ msgstr[2] "Вставляется {0} тегов" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1517,5 +1520,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1526,12 +1529,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1558,6 +1561,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Ошибка" @@ -1585,5 +1588,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Сохранить" @@ -2018,4 +2021,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Скачать данные" @@ -2515,4 +2519,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2852,5 +2857,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Фильтр" @@ -2876,8 +2881,11 @@ " {0}" msgstr "" +"Неправильное выражение для поиска: {0} \n" +"\n" +" {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 msgid "Invalid search expression" -msgstr "" +msgstr "Неверное выражение для поиска" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -3063,5 +3071,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3082,9 +3090,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3188,5 +3196,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Двойной конфликт" @@ -3286,5 +3294,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3298,5 +3306,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Удалить подтверждение" @@ -3490,11 +3498,42 @@ msgstr "Параметры " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Роли в отношениях, относящихся к" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Автоматически исправлять теги" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Ошибка чтения файлов в каталоге {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Удалить старый файл модуля {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Ошибка создания директории кэша: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3722,5 +3761,5 @@ msgstr "В" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3729,5 +3768,5 @@ "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3770,5 +3809,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3812,6 +3851,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3824,5 +3862,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3835,7 +3872,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4059,7 +4095,7 @@ msgstr "Не показывать снова (запомнить выбор)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4067,29 +4103,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "неполный" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "дорога" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "железная дорога" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "водоём" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "землепользование" @@ -4097,7 +4133,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4110,5 +4146,5 @@ msgstr[2] "{0} точек" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "общественный транспорт" @@ -4167,6 +4203,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4174,6 +4210,6 @@ msgstr "здание" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4183,5 +4219,5 @@ msgstr[2] "{0} участников" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4256,5 +4292,5 @@ msgstr "Объект удалён" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4355,70 +4391,70 @@ msgstr "Пароль" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "использование" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "опции" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Показать эту справку" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Стандартный параметр геометрии unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Скачать область в пределах рамки" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" +"Открыть файл (любой тип файлов, который можно открыть с помощью Файл/Открыть)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" -"Открыть файл (любой тип файлов, который можно открыть с помощью Файл/Открыть)" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Скачать область в пределах рамки, как данные GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Скачать расположение с URL (с lat=x&lon=y&zoom=z) как данные GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Выбор с учетом поиска" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Запуск в развернутом виде" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Восстановить настройки по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Указать язык" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "системные настройки Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Сменить папку для всех настроек пользователя" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4432,9 +4468,9 @@ "максимальный размер выделенной памяти" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "примеры" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4444,5 +4480,5 @@ "порядке." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" @@ -4450,33 +4486,49 @@ "selection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Инициализация" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Обновление модулей..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Установка обновлённых модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Загрузка ранних модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Настройки по умолчанию" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Создание интерфейса" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Загрузка модулей" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Устранить" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4485,9 +4537,9 @@ "используется." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4506,10 +4558,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4517,10 +4569,11 @@ msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Заготовки" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4531,5 +4584,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Аудио" @@ -4813,5 +4866,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4829,5 +4882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5052,5 +5105,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Вверх" @@ -5282,6 +5335,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5296,6 +5349,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5358,17 +5411,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Отменить улаживание конфликтов" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Применить улаженные конфликты" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5439,20 +5492,22 @@ msgstr "Конфликты в назначенных тегах" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Вставить ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Из ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "В ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5462,5 +5517,5 @@ msgstr[2] "{0} тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5473,5 +5528,5 @@ msgstr[2] "{0} линий" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5542,5 +5597,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Значение:" @@ -5662,5 +5717,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Подробности" @@ -5844,5 +5899,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57 msgid "Error in filter" -msgstr "" +msgstr "Ошибка в фильтре" #. translators notes must be in front @@ -6070,5 +6125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Создать копию этого отношения и открыть его в другом окне редактора" @@ -6151,5 +6206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6361,5 +6416,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Открыть" @@ -7219,5 +7274,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7836,5 +7891,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<различные>" @@ -7969,5 +8024,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8036,26 +8091,26 @@ msgstr "({0}/{1}): Скачивание отношения ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Теги и участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Родительские отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Дочерние элементы отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Применить роль:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Ввести роль и применить её на выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8067,14 +8122,14 @@ "хотите продолжать с циклическими отношениями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Удалить их, почистить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Игнорировать их, оставить отношение как есть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8087,9 +8142,9 @@ "участника отношения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Несколько участников, относящихся к одному и тому же элементу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8102,5 +8157,5 @@ "''{0}'' будет пропущено." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8109,5 +8164,5 @@ "участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8116,5 +8171,5 @@ "участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8124,5 +8179,5 @@ "выделенным участником" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8132,20 +8187,20 @@ "выделенного участника" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Удалить всех участников, относящихся к каждому из выделенных элементов" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Редактор отношений: удалить выделенное" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Выделить участников отношения, которые относятся к выбранным элементам" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8156,64 +8211,64 @@ "выделенных элементов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Выделить элементы для выделенных участников отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Сортировать участников отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Редактор отношений: сортировать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Поменять порядок участников отношения на обратный" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "В обратном порядке" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Редактор отношений: Наоборот" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Переместить выделенных участников отношения вверх" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Редактор отношений: поднять" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Переместить выделенных участников отношения вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Редактор отношений: опустить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Удалить отмеченных участников из отношения" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Редактор отношений: удалить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Удалить редактируемое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8225,19 +8280,19 @@ "был открыт. Они были удалены из списка участников отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Да, создать конфликт и закрыть" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Нет, продолжить редактирование" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -8245,5 +8300,5 @@ "отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8255,5 +8310,5 @@ "создать конфликт и закрыть редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8264,50 +8319,50 @@ "
Пожалуйста, уладьте этот конфликт, прежде чем продолжать." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Записать внесённые изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Применить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Отменить обновления и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Добавить пустой тег" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Скачать всех неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Редактор отношений: скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Скачать с сервера выделенных неполных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Задать роль для выделенных участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Применить роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8317,27 +8372,33 @@ msgstr[2] "Вы назначили пустую роль на {0} элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Это эквивалентно удалению ролей из этих элементов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Вы действительно хотите назначить новую роль?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Да, записать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Нет, не записывать" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Подтвердить пустую роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Выделенный, при редактировании отношения, участник относится к" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8689,5 +8750,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10312,12 +10373,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Скачать с OSM данные вдоль этого трека" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Скачать всё в пределах:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10325,8 +10390,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Максимальная область для одного запроса:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10350,4 +10417,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10814,10 +10882,10 @@ msgstr[2] "{0} найдено, помеченным GPS." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Удалить изображение с диска" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10828,5 +10896,5 @@ "утерян!" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Невозможно удалить файл изображения." @@ -13246,5 +13314,5 @@ msgstr "Добавить новый тег" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -13255,53 +13323,49 @@ "display_values должно быть такое же, как и в values" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Подробнее" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "Неизвестный запрос: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Доступные роли" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "роль" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "количество" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "элементы" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Дополнительные атрибуты:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "замкнутая линия" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Неизвестный тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "Заготовка элемента роли без родителей" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "Заготовка вложенного элемента без родителей" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -13311,15 +13375,15 @@ msgstr "Не удалось прочитать источник заготовок тегов: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Ошибка при разборе {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Элемент типа {0} не поддерживается." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13330,18 +13394,18 @@ msgstr[2] "Изменить {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Ничего не выделено!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Неудачный выбор!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Применить заготовку" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Изменить параметры" @@ -13356,4 +13420,28 @@ msgid "Preset group {0}" msgstr "Группа заготовок {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Поиск: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Поиск объектов" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Показать русифицированное название в списках выбора" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Поиск: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -14115,5 +14203,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -14125,10 +14213,10 @@ msgstr "Файлы сервера OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "Произошла ошибка при сохранении.
Ошибка:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -14139,5 +14227,5 @@ "
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14931,11 +15019,11 @@ msgstr "Скачивание с сервера списка модулей..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Скачивание списка модулей с ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14946,16 +15034,16 @@ "записать в кэш список модулей с сайта модулей ''{1}''." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Запись списка модулей в локальный кэш ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Разбор списка модулей с сайта ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14966,5 +15054,5 @@ "Текст ошибки: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -15296,5 +15384,5 @@ "

Сообщение об ошибке:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16119,5 +16207,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 msgid "on polygon" -msgstr "" +msgstr "на полигоне" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 @@ -16127,5 +16215,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 msgid "Helping tool for tag address" -msgstr "" +msgstr "Вспомогательный инструмент для тега адреса" #. group "Man-Made" @@ -16136,14 +16224,14 @@ msgstr "Здания" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +msgstr "Next no" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Улица" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "Ввести адреса" @@ -16180,5 +16268,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Выбрать Feuille (слой??)" @@ -16237,5 +16325,5 @@ msgstr "CadastreGrabber: Неправильная ссылка" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -16245,5 +16333,5 @@ "Сервер на обслуживании или временного перегружен." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -16254,5 +16342,5 @@ "или действие отменено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Выбрать из..." @@ -16260,17 +16348,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Выберите общее" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Кадастр" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Авто источники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -16282,13 +16370,13 @@ "Вы хотите назначить на клавишу F11 функцию захвата?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Восстановить действие захватывающей клавиши F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM остановлено для того, чтобы проявились изменения." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -16315,15 +16403,22 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Отменить обрезку изображения во время геопривязки" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Выберите Таблицу d'Assemblage" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "Сначала выберите слой WMS в списке." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" +"Не использовать отношение для адресов (однако, \"addr:street\" на " +"элементах)." #. item "Man Made/Pipeline" combo "Type" @@ -16377,5 +16472,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -16386,13 +16481,13 @@ msgstr "вода" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "символ" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "участок" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "номер участка" @@ -16440,5 +16535,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -16446,26 +16541,26 @@ msgstr "адрес" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "район" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "раздел" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "коммуна" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Включить автоматическое кеширование." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Макс. размер кеша (МБ)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16483,18 +16578,18 @@ "данных, созданный этим модулем." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS французского кадастра" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Значение тега \"source\" когда включенs автоисточники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Источник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16503,5 +16598,5 @@ "Заменить оригинальный белый фон на цвет фона, заданный в настройках JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16511,129 +16606,134 @@ "Полезно для текстов на темном фоне." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Позволяет накладывать несколько слоёв" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Установить прозрачность слоев WMS. Справа непрозрачный, слева прозрачный." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Нарисовать прямоугольник вокруг данных, скачанных с сервера WMS." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Разрешение изображения:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Высокое разрешение (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Среднее разрешение (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Низкое разрешение (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Интерполяционный фильтр изображения:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Ближайший-Сосед (быстро) [ По умолчанию]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Билинейная (быстро)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Бикубическая (медленно)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Коэффициент захвата векторных изображений:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Захватить весь экран в одно изображение" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Захватить мелкие изображения (высокое качество, но использует больше памяти)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Фиксированный размер площади (по умолчанию 100 м)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фиксированный размер (от 25 до 1000 метров)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Слои:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "Моря, реки, бассейны." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Здания, убежища, подземные сооружения." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Символ, похожий на православный крест." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Участки." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Номера участков, названия улиц." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Адреса, номера домов." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Населённые пункты, деревни, местности" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Разделы и подразделы кадастра." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Муниципальные административные границы." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Коэффициент захвата растровых изображений:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Показать перекрестья:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Более старые файлы автоматически удаляются, когда этот размер превышен" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16643,7 +16743,7 @@ "несколько слоёв." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." -msgstr "" +msgstr "Позволить при этом использовать тег \"add:street\" на точках." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -17060,4 +17160,39 @@ msgid "TCX Files (*.tcx)" msgstr "Файлы TCX (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Скачать объект .." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Скачать данные карты, лежащие на конце выбранной линии" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Скачать с сервера сейчас" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Выберите хотя бы один тип данных для скачивания." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Тест {0}/{1}: Идёт {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Ошибка разбора {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -17147,5 +17282,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "Использовать внешние сценарии в JOSM" @@ -17228,5 +17363,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Обновить" @@ -17789,31 +17924,32 @@ msgstr "Измерения" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Левый Мичиганский поворот" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "Добавляет запрет поворота налево на группу из 4 или 5 линий." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" "Пожалуйста, выберите 4 или 5 линий, чтобы назначить запрет поворота налево." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Пожалуйста, выделите 4 линии, которые образуют закрытое отношение." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Невозможно упорядочить линии. Пожалуйста, проверьте их направление" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Создать запрет поворота налево для Michigan" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -17934,13 +18070,13 @@ msgstr "Очередь" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "не в сети" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "в сети" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -18284,9 +18420,9 @@ #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 msgid "Create Stops from GTFS ..." -msgstr "" +msgstr "Создать остановки из GTFS..." #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 msgid "Create Stops from a GTFS file" -msgstr "" +msgstr "Создать остановки из файла GTFS" #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 @@ -18298,5 +18434,5 @@ #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 msgid "GTFS-Stops" -msgstr "" +msgstr "GTFS-остановки" #. item "Bicycle/Rental" text "Name" @@ -18456,9 +18592,4 @@ msgstr "Отсутствует результат слияния для {0} с id {1}" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "Полученный тип {0} с id {1} имеет неправильную версию" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18503,5 +18634,5 @@ msgstr "Откатить пакет правок #{0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "Модуль Road Sign" @@ -18529,10 +18660,10 @@ msgstr "Ошибка разбора заготовки тегов из ''{0}'':\n" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "Знак {0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19819,47 +19950,47 @@ msgstr "Перейдите к Основному редактору и выберите линию OSM" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "Восстановить объект..." -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "Восстановить объект по id" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "Выделите, если данные должны быть добавлены в новый слой" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "Введите ID объекта, который хотите восстановить" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "Восстановить объект" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "Восстановить объект" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "Начать восстановление" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "Зактрыть диалог и отменить" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "Ожидается получить {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "Поиск для {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -20100,14 +20231,50 @@ msgstr "Пересекающиеся линии" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Дублированные точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Этот тест проверяет, чтобы не было наложенных точек." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Объединить дубликаты точек?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Дублированные точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Дублированные точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Объединить дубликаты точек?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Дублированные точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Объединить дубликаты точек?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Точки в одной и той же позиции" @@ -20266,59 +20433,59 @@ msgstr "Перекрытие линий" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "Проверка отношений:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "Этот модуль проверяет отношения на наличие ошибок." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "Неизвестный тип отношения" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "Пустое отношение" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "<пусто>" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "Отсутствует роль {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "Проблема проверки роли" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "Номер роли {0} слишком маленький ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "Номер роли {0} слишком большой ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "Неверный тип участника роли {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "Неизвестная роль {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "Обнаружена пустая роль" @@ -21217,9 +21384,9 @@ msgstr "Ошибочная ссылка?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Скачать видимые квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21228,33 +21395,33 @@ "измените разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Изменить разрешение" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Загрузить заново ошибочные квадраты карты" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Альфа канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Сохранить слой WMS в файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Сохранить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Загрузить слой WMS из файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Загрузить WMS слой" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" @@ -21262,13 +21429,13 @@ "Неподдерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Ошибка формата файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Ошибка при загрузке файла" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Установить закладку WMS" @@ -21415,231 +21582,127 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "создать отношение associatedStreet" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "граница" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Увеличивать" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "высоковольтная" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "мультиполигон" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Сеть" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "общественный транспорт" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Ограничение" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "маршрут" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "окрестность" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "водоём" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "Все файлы" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "Атрибуты" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "Закрыть диалоговое окно выбора файла" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "Отменить диалог выбора файла." #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "Создать новую папку" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "Удалить файл" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "Укажите имя файла" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "Введите путь или имя каталога:" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "Ошибка " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -21647,90 +21710,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "Имя файла:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "Имя файла:" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "Справка по выбору файла." #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "Файлы" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "Файлы типа:" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "Файлы типа:" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "Фильтр:" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "Каталоги" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "Домашняя папка" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "Список" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "Искать в:" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "Папка:" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "Изменено" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "Новая папка" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "Открыть выбранный файл" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "Открыть выбранный файл" #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "Переименовать файл" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -21738,75 +21801,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "Сохранить в:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "Сохранить в:" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "Сохранить выделенный файл." #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "Выбор:" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "Размер" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "Вверх на один уровень" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "Обновить" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "Обновить список каталога." #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "Синий:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "Цвет:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "Зелёный:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "Оттенок:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "Выбор цвета GTK" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "Красный:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "Насыщенность:" @@ -21874,11 +21937,17 @@ "непосредственно на сайт openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Скачать с OSM данные вдоль этого трека" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Дублирует линии с помощью смещения" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21889,5 +21958,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -21895,15 +21964,15 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Показывает информацию о маршруте в виде диаграмы." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Предоставить фоновый слой который отображает сетку на карте" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21916,10 +21985,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Помогает векторизовать изображения WMS." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21928,5 +21997,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21939,15 +22008,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Добавляет запрет поворота налево для наборов из 4 или 5 линий" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Просто преобразовать область в мультиполигон." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21958,5 +22027,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21969,15 +22038,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Отображает фоновый рисунок OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Импорт вопросов из OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21987,5 +22056,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21995,5 +22064,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -22004,5 +22073,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -22013,10 +22082,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великолепный JGoodies Пластиковый Скин." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -22026,15 +22095,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Разрешить другим приложениям посылать команды в JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Модуль для отката пакетов правок" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -22042,7 +22111,10 @@ "properties window. Available country presets: Germany." msgstr "" +"Модуль для назначения тегов объектам на основе выбора дорожных знаков. " +"Диалог можно открыть нажав на небольшую пиктограмму в правом верхнем углу " +"окна свойств. Заготовка пока есть только для Германии." #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22053,10 +22125,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Предоставляет возможности маршрутизации." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22068,5 +22140,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22077,15 +22149,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволяет добавлять метки/точки в текущей GPS позиции." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показывает окно для редактирования тегов в табличной сетке." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22098,10 +22170,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Сделать ряд домов вдоль улицы из одного блока." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22113,5 +22185,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22122,5 +22194,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22131,10 +22203,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22146,5 +22218,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22157,5 +22229,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22166,15 +22238,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Быстрое скачивание вдоль большого набора связанных линий" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Выделить последовательность неветвящихся соединённых линий" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22186,5 +22258,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27268,5 +27340,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "american_football" -msgstr "" +msgstr "американский_футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27298,5 +27370,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canadian_football" -msgstr "" +msgstr "канадский_футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27343,5 +27415,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "gaelic_football" -msgstr "" +msgstr "гаэльский_футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27383,10 +27455,10 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "rugby_league" -msgstr "" +msgstr "лига_регби" #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "rugby_union" -msgstr "" +msgstr "объединение_регби" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27877,46 +27949,46 @@ #: build/trans_presets.java:2076 msgid "American Football" -msgstr "" +msgstr "Американский футбол" #. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 msgid "Edit American Football" -msgstr "" +msgstr "Свойства Американского футбола" #: build/trans_presets.java:2082 msgid "Canadian Football" -msgstr "" +msgstr "Канадский футбол" #. item "Sport (Ball)/Canadian Football" #: build/trans_presets.java:2083 msgid "Edit Canadian Football" -msgstr "" +msgstr "Свойства Канадского футбола" #: build/trans_presets.java:2088 msgid "Gaelic Football" -msgstr "" +msgstr "Гаэльский футбол" #. item "Sport (Ball)/Gaelic Football" #: build/trans_presets.java:2089 msgid "Edit Gaelic Football" -msgstr "" +msgstr "Свойства Гаэльского футбола" #: build/trans_presets.java:2094 msgid "Rugby League" -msgstr "" +msgstr "Лига регби" #. item "Sport (Ball)/Rugby League" #: build/trans_presets.java:2095 msgid "Edit Rugby League" -msgstr "" +msgstr "Свойства лиги регби" #: build/trans_presets.java:2100 msgid "Rugby Union" -msgstr "" +msgstr "Объединение регби" #. item "Sport (Ball)/Rugby Union" #: build/trans_presets.java:2101 msgid "Edit Rugby Union" -msgstr "" +msgstr "Свойства объединения регби" #: build/trans_presets.java:2106 @@ -28781,8 +28853,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "высоковольтная" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "среднего / низкого напряжения" @@ -34146,4 +34222,177 @@ msgstr "пляж" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "маршрут" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "граница" + #. color deprecated #. @@ -34663,4 +34912,10 @@ msgstr "Sicily - Италия" +#~ msgid "closedway" +#~ msgstr "замкнутая линия" + +#~ msgid "Target of type {0} with id {1} has invalid version" +#~ msgstr "Полученный тип {0} с id {1} имеет неправильную версию" + #~ msgid "No data imported." #~ msgstr "Данные не импортированы" @@ -35442,7 +35697,4 @@ #~ msgid "Invalid projection" #~ msgstr "Неправильная проекция" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Выберите Таблицу d'Assemblage" #~ msgid "Edit Information Office" @@ -35972,7 +36224,4 @@ #~ msgstr "Скачать зависимости с OSM..." -#~ msgid "Please select at least one task to download" -#~ msgstr "Выберите хотя бы один тип данных для скачивания." - #~ msgid "" #~ "You are about to delete nodes outside of the area you have downloaded." @@ -36651,7 +36900,4 @@ #~ msgstr "Удалить старый модуль {0}" -#~ msgid "Delete old plugin file {0}" -#~ msgstr "Удалить старый файл модуля {0}" - #~ msgid "Expected value > 0 for parameter ''{0}'', got {1}" #~ msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}" Index: applications/editors/josm/i18n/po/sk.po =================================================================== --- applications/editors/josm/i18n/po/sk.po (revision 22464) +++ applications/editors/josm/i18n/po/sk.po (revision 22465) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" "PO-Revision-Date: 2010-06-23 22:48+0000\n" "Last-Translator: Vlado \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: 2010-07-11 18:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Nápoveda" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Parameter \"downloadgps\" neakceptuje názov súboru, alebo URL súboru" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -235,8 +235,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -246,13 +246,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -268,5 +269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -275,5 +276,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -290,13 +292,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Zrušiť" @@ -357,11 +359,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -408,6 +410,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -435,5 +438,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -557,5 +560,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -617,6 +620,6 @@ msgstr "Prosím, vyberte aspoň dve cesty pre spojenie." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -625,9 +628,9 @@ msgstr "Kopírovať" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Vybrať označené objekty pre vloženie." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Prosím zvoľ niečo pre kopírovanie" @@ -662,6 +665,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -730,5 +733,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Oddeliť vrstvu" @@ -748,5 +751,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objekt podľa typu:" @@ -757,5 +760,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objekt podľa ID:" @@ -800,5 +803,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplikovať" @@ -947,25 +950,25 @@ msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Pridať body na všetky priesečníky" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Vymazať cesty, ktoré nie sú vnútornou časťou multipolygónu" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Oprava relácie" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Spojená prekrývajúca sa plocha" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Spojené prekrývajúce sa plochy" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -975,33 +978,33 @@ "overte či to nepredstavuje nejakú chybu." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Zadajte hodnoty pre všetky konflikty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Riešenie konfliktov" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Oprava konfliktu (rozporu) značiek" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Odstránený Prvok z Relácií" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Spojiť plochy: Vymazať krátke cesty" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Uzavretá cesta" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Vymazať značky z vnútorných ciest" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Funkcie Spojenia Plôch (Join Areas Function)" @@ -1020,5 +1023,5 @@ msgstr "Spojiť body a línie" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Bez skratky" @@ -1384,6 +1387,6 @@ msgstr "Prosím vyberte trasy s uhlami približne 90 alebo 180 stupňov." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1394,17 +1397,17 @@ msgstr "Vložiť" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Vložiť zo schránky" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Vymazať nekompletné členy?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Vložiť bez neúplných členov" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1415,14 +1418,14 @@ "pôvodné budú odstránené. Chcete vložiť dáta bez nekompletných pôvodných?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Vložiť vlastnosti" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Použiť značky objektov v schránke na všetky zvolené objekty." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1432,5 +1435,5 @@ msgstr[2] "Vkladanie {0} značiek" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1500,5 +1503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1509,12 +1512,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1541,6 +1544,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Chyba" @@ -1568,5 +1571,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Uložiť" @@ -2002,4 +2005,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Sťahujem dáta" @@ -2495,4 +2499,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2822,5 +2827,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -3028,5 +3033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3047,9 +3052,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3153,5 +3158,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dvojitý konflikt" @@ -3251,5 +3256,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3263,5 +3268,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Odstrániť potvrdenie" @@ -3455,11 +3460,42 @@ msgstr "Vlastnosti " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Funkcie vo vzťahoch (relations) odkazujú na" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatická úprava značiek (tag)" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Chyba pri získavaní súború z adresára {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Zmazať staršie súbory pluginov {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Chyba pri vytváraní cache adresára: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3687,5 +3723,5 @@ msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3693,5 +3729,5 @@ msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3734,5 +3770,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3777,6 +3813,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3789,5 +3824,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3800,7 +3834,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4023,7 +4056,7 @@ msgstr "Znovu nezobrazovať (možnosť pripomenutia)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4031,29 +4064,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "neúplný" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "komunikácie" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "železnica" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vodný tok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "využitie oblasti (landuse)" @@ -4061,7 +4094,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4074,5 +4107,5 @@ msgstr[2] "{0} bodov" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "hromadná doprava" @@ -4131,6 +4164,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4138,6 +4171,6 @@ msgstr "budova" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4147,5 +4180,5 @@ msgstr[2] "{0} členy" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4220,5 +4253,5 @@ msgstr "Objekt je vymazaný" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4321,70 +4354,70 @@ msgstr "Heslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "použitie" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "Možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Zobrazí túto nápovedu" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Štandardný unix geometry argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Stiahnuť ohraničujúcí box" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" +"Otvoriť súbor (niektoré typy súborov môžu byť otvorené s Súbor/Otvoriť)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" -"Otvoriť súbor (niektoré typy súborov môžu byť otvorené s Súbor/Otvoriť)" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "Sťahovanie polohy na url (so lat=x&lon=y&zoom=z) ako raw gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Výber s určeným hľadaním" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Spustiť v maximalizovanom režime" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Nastaviť východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Nastaviť jazyk" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "možnosti poskytnutia ako Java system properties" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/CESTA/K/JOSM/ZLOŽKE/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Zmena adresára pre všetký nastavenia užívateľa" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4398,9 +4431,9 @@ "megabytes" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "príklady" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4410,46 +4443,62 @@ "poriadku." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "Uistite sa, že ste načítali nejaké dáta ak ste použili --výber." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Prebieha inicializácia" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Aktualizujem pluginy..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Inštalujem aktualizované pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Načítavam skoršie pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Nastavujem východzie hodnoty" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Vytváram hlavné grafické rozhranie ( GUI )" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Načítavam pluginy" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Vyriešiť" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Súbor" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4468,10 +4517,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4479,10 +4528,11 @@ msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Predvoľby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4493,5 +4543,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Zvuk" @@ -4774,5 +4824,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4790,5 +4840,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5014,5 +5064,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Hore" @@ -5241,6 +5291,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5255,6 +5305,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5315,17 +5365,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Zrušiť rozhodnutie konfliktu" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Použiť vyriešený konflikt" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5396,20 +5446,22 @@ msgstr "Konflikty vo vkladaných značkách" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Vkladám ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "Z ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "Do ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5419,5 +5471,5 @@ msgstr[2] "značiek" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5430,5 +5482,5 @@ msgstr[2] "{0} cesty" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5497,5 +5549,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Hodnota:" @@ -5618,5 +5670,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Podrobnosti" @@ -6030,5 +6082,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne" @@ -6111,5 +6163,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6324,5 +6376,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Otvorené" @@ -7182,5 +7234,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7796,5 +7848,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7927,5 +7979,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7989,26 +8041,26 @@ msgstr "({0}/{1}): Sťahujem reláciu ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Značky a Členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Nadradené vzťahy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Odvodená relácia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Použiť Funkciu:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Vložiť funkciu a použiť na vybraté členy relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8020,14 +8072,14 @@ "chcete pokračovať s kruhovou závislosťou?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Odstraňte ich, vyčistite reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ignorujte ich, nechajte reláciu tak ako je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8040,9 +8092,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Viacnásobné členy odkazujú na rovnaké obecné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8054,5 +8106,5 @@ "odkazy a je preto znechutený.
Vynechanie relácie ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8060,5 +8112,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8066,5 +8118,5 @@ "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8074,5 +8126,5 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8082,20 +8134,20 @@ "členom" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Editor Relácií: Odstrániť Vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8105,64 +8157,64 @@ "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Výber pôvodných pre vybraté členy relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Triedenie členov relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Triediť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Editor Relácií: Triedenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Obrátiť poradie členov relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "Obrátene" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Editor relácie: Obrátenie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Pridať všetky zvolené objekty medzi členy" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Editor Relácií: Posun Hore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Presunúť zvolenú vrstvu o riadok dolu." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Editor Relácií: Posun Dole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Odstrániť práve vybraté členy z tejto relácie" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Editor Relácií: Odstrániť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Vymazať práve vydanú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8174,24 +8226,24 @@ "bol otvorený. Mali by byť odstránené z obsahu členov relácie." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Áno, vyriešiť konflikt a zavrieť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Kliknutie vytvorí konflikt a zatvorí editor tejto relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Nie, pokračovať v editácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" "Kliknutím sa vrátite do editora relácie na pokračovanie v úprave relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8203,5 +8255,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8212,50 +8264,50 @@ "rozhodnite najskôr tento konflikt, potom skúste znovu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Použiť súčasnú aktuálizáciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Použiť aktualizácie a zavrieť dialógové okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Pridať prázdnu značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Stiahnuť všetký nekompletné členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Stiahnuť členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Editor Relácií: Sťahovanie Členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Stiahnuť vybraté nekompletné členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Nastavenie funkcie pre vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Použiť Funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8265,27 +8317,33 @@ msgstr[2] "Nastavili ste prázdnu funkciu na {0} pôvodých." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Toto sa rovná vymazaniu funkcií týchto pôvodných." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Naozaj chcete vymazať vrstvu ''{0}''?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Áno, Použiť to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Nie, použite to" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Potvrdiť prázdnu funkciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8631,5 +8689,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10218,12 +10276,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Stiahnuť z OSM okolie tejto stopy (track)" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Stiahnuť všetko vo vnútry:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10231,8 +10293,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Maximálna plocha na požiadavku:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10256,4 +10320,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10720,10 +10785,10 @@ msgstr[2] "{0} boli založené GPS značky." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Vymazať súbor s obrázkom z disku" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10734,5 +10799,5 @@ "stratený!" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Súbor s obrázkom nemôže byť zmazaný." @@ -13114,5 +13179,5 @@ msgstr "Pridať novú značku" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -13123,53 +13188,49 @@ "byť rovnaký ako v hodnotách" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Viac informácii o tejto vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Dostupné úlohy" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "úlohy" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "počet" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "prvky" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Voliteľné atribúty:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "uzavratá cesta" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Neznány type (druh): {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -13179,15 +13240,15 @@ msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Chyba rozkladania(parsovania) {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Elementy typu(druhu) {0} sú podporované." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13198,18 +13259,18 @@ msgstr[2] "Zmeniť {0} objektov" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Nič nie je vybraté!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Nevhodný výber!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Použiť predvolené" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Zmeniť vlastnosti" @@ -13224,4 +13285,28 @@ msgid "Preset group {0}" msgstr "Prednastavená skupina {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Hľadať: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Vyhľadávanie pre objekty" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Ukáž lokalizovaný názov vo vybratom zozname" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Hľadať: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13975,5 +14060,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13985,5 +14070,5 @@ msgstr "Súbory OSM Servera" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" @@ -13991,5 +14076,5 @@ "Nejaká chyba nastala počas ukladania.
Chyba je:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -14000,5 +14085,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14790,11 +14875,11 @@ msgstr "Stiahujem zoznam pluginov ..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Sťahovanie zoznamu pluginov z ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14805,16 +14890,16 @@ "obsah pluginu z webu pluginu ''{1}''." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Zapisujem obsah pluginu do miestnej cache ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Rozkladanie obsahu pluginu z webu ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14825,5 +14910,5 @@ "Vynechávam. Výnimka bola: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -15158,5 +15243,5 @@ "

Chybová správa je:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15902,14 +15987,14 @@ msgstr "Budovy, stavby" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Ulica" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15946,5 +16031,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Vybrať Feuille" @@ -16003,5 +16088,5 @@ msgstr "CadastreGrabber: Nedovolená url." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -16011,5 +16096,5 @@ "Server je v údržbe alebo dočasne preťažený." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -16020,5 +16105,5 @@ "alebo ja akcia zrušená" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Vybrať z..." @@ -16026,17 +16111,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Vybrať hranice obce(samosprávy)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Automatické získavanie" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -16048,13 +16133,13 @@ "Budete si želať obnoviť F11 pre grabovanie?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Obnoviť klávesovú skratku pre grabovanie F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -16081,5 +16166,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" @@ -16087,8 +16172,13 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +#, fuzzy +msgid "Use \"Tableau d''assemblage\"" +msgstr "Vybrať Tableau d'Assemblage" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "Zvoľte najprv WMS vrstvu v zozname." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -16144,5 +16234,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -16153,13 +16243,13 @@ msgstr "voda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "parcela" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "číslo parcely" @@ -16207,5 +16297,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -16213,26 +16303,26 @@ msgstr "adresa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "lokalita" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "kraj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "obec" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Povoliť automatické cachovanie." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Maximálna veľkost cache (v MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16249,18 +16339,18 @@ "
predtým, ako nahráte nejaké dáta vytvorené týmto pluginom." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "French cadastre WMS (Francúzsky kataster WMS)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Zdroj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16270,5 +16360,5 @@ "JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16278,128 +16368,133 @@ "pre texty na tmavých pozadiach." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Povoliť vyrovnanie viacnásobných vrstiev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Nastaviť priehľadnosť WMS vrstiev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Rozlíšenie obrázku:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Vysoké rozlíšenie (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Vysoké rozlíšenie (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Nízke rozlíšenie (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Obrázkový filter interpolácie:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Najbližší-Sused (najrýchlejší) [ Default ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Bilineárne (rýchle)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Bikubicky (pomalé)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Zachytávač vektorových obrázkov multiplikátor:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Zachytiť obrázok celej obrazovky" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Zachytávanie menších obrázkov ( vyššia kvalita, ale použije viac pamäte)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Pevná veľkosť štvorcov (východzia 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Pevná veľkosť v rozmedzí (od 25 do 1000 metrov)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Vrstvy:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "Pozri, rieky, bazény." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Budovy, kryty, podzemné stavby" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Symboly ako kríže." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Parcely." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Čísla parciel, mená ulíc." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Adresy, čísla domov." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Oblasť, osada, miesto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Katastrálne(Fr) sekcie a podsekcie" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Obecné administratívne hranice" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Zachytávač rastrových obrázkov multiplikátor:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Zobraziť kríže:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16409,5 +16504,5 @@ "(grabovaní)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16830,4 +16925,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX Súbory (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Sťahujem objekt..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Sťahovanie údajov mapy na konci vybratej cesty" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Stiahnuť teraz" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Overovanie {0}/{1}: Súšťa sa {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Chyba parsovania{0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16917,5 +17047,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16998,5 +17128,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Obnoviť" @@ -17554,30 +17684,31 @@ msgstr "Meranie" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Michigan Left" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "Pridť zákaz zabočenia vľavo pre sadu zo 4 alebo 5 ciest." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "Prosím vybrať 4 alebo 5 ciest na priradenie zákazu zabočenia v ľavo." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Prosím označte 4 cesty, ktoré tvoria uzavretú reláciu." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Pre neschopnosť usporiadať cesty. Prosím skontrolovať ich smery" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Vytvoriť Michigan zákaz odbočenia vľavo" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -17698,13 +17829,13 @@ msgstr "Poradie" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "odpojený" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "pripojený" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -18212,9 +18343,4 @@ msgstr "Chýba zlučovaný cieľ pre {0} s id {1}" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18257,5 +18383,5 @@ msgstr "Vraciam zmeny zmenového súboru #{0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -18283,10 +18409,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19555,47 +19681,47 @@ msgstr "Prejdite do Základného Editora a vyberte OSM cestu" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "Obnoviť objekt..." -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "Obnoviť objekt s id" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "Vyberte v prípade, že údaje by mali byť pridané do novej vrstvy" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "Zadajte ID objektu, ktorý by mali byť obnovený" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "Obnoviť Objekt" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "Obnoviť Objekt" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "Spustiť obnovenie" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "Zatvoriť dialóg a zrušiť" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19837,14 +19963,50 @@ msgstr "Zkrížené cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Duplicitné body" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Zlúčiť duplikátne body?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Duplicitné body" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Duplicitné body" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Zlúčiť duplikátne body?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Duplicitné body" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Zlúčiť duplikátne body?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Body s rovnakou pozíciou" @@ -20006,59 +20168,59 @@ msgstr "Prekrývajúce sa cesty" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -20948,9 +21110,9 @@ msgstr "Chybná URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Stiahnuť viditeľné dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -20958,46 +21120,46 @@ "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť." -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Zmena rozlíšenia" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Nahrať poškodené dlaždice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alfa kanál" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Uložiť WMS vrstvu do súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Uložiť WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Nahrať WMS vrstvu zo súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Načítať WMS vrstvu" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Chyba formátu súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Chyba pri nahrávaní súboru" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Nastaviť WMS Záložku" @@ -21143,398 +21305,294 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "vytvoriť pridruženú reláciu" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "hranica (boundary)" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Prírastok" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "vedenie" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "multipolygón" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Sieť" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "hromadná doprava" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Obmedzenie" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "trasa (route)" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "miesto (blízke okolie)" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vodný tok" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Aktualizovať" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -21598,11 +21656,17 @@ "na openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Stiahnuť z OSM okolie tejto stopy (track)" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Duplikovať cesty s rozostupom/vzdialenosťou" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21613,20 +21677,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "Sťahuje GPS body z Globalsat DG100 datalogger-a priamo do JOSM." #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Vizualizuje \"routing information\" ako routovací graf." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Určiť vrstvu pozadia pre zobrazenie mapovej súradnicovej siete" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21639,10 +21703,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Pomoc pri vektorizácii WMS obrázkov." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21652,5 +21716,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21663,15 +21727,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Pridanie zákazu zabočenia vľavo pre sadu zo 4 alebo 5 ciest" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Jednoduché prevedenie oblasti na multipolygón." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21682,5 +21746,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21693,15 +21757,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Zobrazenie OpenLayers obrázok pozadia" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje vydania z OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21711,5 +21775,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21718,5 +21782,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21727,5 +21791,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -21736,10 +21800,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ohromný JGoodies Plastic Look and Feel." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21747,15 +21811,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Necháva ostatné aplikácie poslať príkaz do JOSMu." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21765,5 +21829,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21774,10 +21838,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Určuje trasové schopnosti" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21786,5 +21850,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21795,15 +21859,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Určuje dialóg pre editáciu značiek v tabuľkovej mriežke." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21816,10 +21880,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Vytvára radové domy mimo jednotlivých blokov." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21828,5 +21892,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21837,5 +21901,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21844,10 +21908,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21859,5 +21923,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21867,5 +21931,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21876,5 +21940,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -21882,10 +21946,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Vyberte poradie nerozvetvených spojených ciest" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21896,5 +21960,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -28503,8 +28567,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "vedenie" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "vedľajšie_vedenie" @@ -33869,4 +33937,177 @@ msgstr "pláž (beach)" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "trasa (route)" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "hranica (boundary)" + #. color deprecated #. @@ -34384,4 +34625,7 @@ msgid "Sicily - Italy" msgstr "Sicily - Italy" + +#~ msgid "closedway" +#~ msgstr "uzavratá cesta" #~ msgid "Move" @@ -35221,7 +35465,4 @@ #~ msgstr "Lambert Zóna 2 cache súbor (.2)" -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Vybrať Tableau d'Assemblage" - #~ msgid "Auto-tag source added:" #~ msgstr "Dodatočný zdroj automatických-značiek:" @@ -35423,7 +35664,4 @@ #~ msgid "All the ways were empty" #~ msgstr "Všetky cesty boli prázdne" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu" #~ msgid "Merge nodes with different memberships?" @@ -36481,7 +36719,4 @@ #~ msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}" -#~ msgid "Delete old plugin file {0}" -#~ msgstr "Zmazať staršie súbory pluginov {0}" - #~ msgid "" #~ "Target object with id {0} and version {1} is visible although source " Index: applications/editors/josm/i18n/po/sl.po =================================================================== --- applications/editors/josm/i18n/po/sl.po (revision 22464) +++ applications/editors/josm/i18n/po/sl.po (revision 22465) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" "PO-Revision-Date: 2010-06-28 15:54+0000\n" "Last-Translator: Dirk Stöcker \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: 2010-07-11 18:52+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -24,11 +24,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Pomoč" @@ -41,5 +41,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -72,7 +72,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -229,8 +229,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -240,13 +240,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -262,5 +263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -269,5 +270,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -284,13 +286,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Prekliči" @@ -349,11 +351,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -400,6 +402,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -427,5 +430,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -549,5 +552,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -607,6 +610,6 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -615,9 +618,9 @@ msgstr "Kopiraj" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopiraj izbrane predmete v odložišče" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Izberite predmete, ki jih želite kopirati." @@ -650,6 +653,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -718,5 +721,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Ločena plast" @@ -736,5 +739,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "" @@ -745,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "" @@ -788,5 +791,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Podvoji" @@ -934,25 +937,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -960,33 +963,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Razreši neskladja" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "" @@ -1005,5 +1008,5 @@ msgstr "Priključi vozlišče v pot" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "" @@ -1348,6 +1351,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1358,17 +1361,17 @@ msgstr "Prilepi" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Prilepi vsebino odložišča" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1377,14 +1380,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Prilepi oznake" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1393,5 +1396,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1460,5 +1463,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1469,12 +1472,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1501,6 +1504,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Napaka" @@ -1528,5 +1531,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Shrani" @@ -1938,4 +1941,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "" @@ -2401,4 +2405,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2703,5 +2708,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "" @@ -2896,5 +2901,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2915,9 +2920,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "V redu" @@ -3018,5 +3023,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3109,5 +3114,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3118,5 +3123,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3300,11 +3305,42 @@ msgstr "Lastnosti " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Samodejno popravljanje oznak" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Napaka pri nalaganju strani {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3506,5 +3542,5 @@ msgstr "V" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3512,5 +3548,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3550,5 +3586,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3589,6 +3625,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3602,5 +3637,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3614,7 +3648,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3834,7 +3867,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3842,29 +3875,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "nepopoln" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "cesta" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "železnica" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vodotok" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "raba tal" @@ -3872,7 +3905,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3886,5 +3919,5 @@ msgstr[3] "{0} točke" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3943,6 +3976,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3950,6 +3983,6 @@ msgstr "zgradba" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3960,5 +3993,5 @@ msgstr[3] "{0} člani" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4033,5 +4066,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4126,69 +4159,69 @@ msgstr "Geslo" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "uporaba" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "možnosti" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Prikaži to pomoč" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +msgid "Standard unix geometry argument" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 -msgid "Standard unix geometry argument" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the bounding box" msgstr "Sprejmi pravokotno področje" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Sprejmi pravokotno področje GPS podatkov" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgid "Select with the given search" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 -msgid "Select with the given search" +msgid "Launch in maximized mode" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Reset the preferences to default" msgstr "Ponastavi nastavitve na privzete" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4198,9 +4231,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "primeri" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4208,46 +4241,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Pripravljanje" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Nalaganje zgodnjih vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Privzete nastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Priprava grafičnega uporabniškega vmesnika" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Nalaganje vstavkov" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Razreši" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Datoteka" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4266,10 +4315,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Pogled" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4277,10 +4326,11 @@ msgstr "Orodja" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Prednastavitve" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4291,5 +4341,5 @@ msgstr "Meni: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Zvok" @@ -4556,5 +4606,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4572,5 +4622,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4775,5 +4825,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Gor" @@ -4990,6 +5040,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5004,6 +5054,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5064,17 +5114,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5145,20 +5195,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5167,5 +5219,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5177,5 +5229,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5241,5 +5293,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5343,5 +5395,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5743,5 +5795,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5824,5 +5876,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6024,5 +6076,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6875,5 +6927,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7443,5 +7495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7576,5 +7628,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7631,26 +7683,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7659,14 +7711,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7676,9 +7728,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7688,15 +7740,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7704,5 +7756,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7710,20 +7762,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7732,64 +7784,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Pomakni izbranega člana vrstico višje." #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7798,23 +7850,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7823,5 +7875,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7830,50 +7882,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7882,26 +7934,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8236,5 +8294,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9661,12 +9719,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Sprejmi iz OSM vzdolž te sledi" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Sprejmi vse znotraj:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9674,8 +9736,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9699,4 +9763,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10136,10 +10201,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10148,5 +10213,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12313,5 +12378,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12320,53 +12385,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12376,15 +12437,15 @@ msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12396,18 +12457,18 @@ msgstr[3] "Spremeni {0} predmete" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Uporabi prednastavitev" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Spremeni lastnosti" @@ -12422,4 +12483,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Iskanje" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Iskanje predmetov." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Povečava na ves izbor" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Iskanje predmetov." #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13123,5 +13208,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13133,10 +13218,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13145,5 +13230,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13868,11 +13953,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13881,16 +13966,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13899,5 +13984,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14158,5 +14243,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14869,14 +14954,14 @@ msgstr "Zgradbe" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14908,5 +14993,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -14963,5 +15048,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -14969,5 +15054,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -14976,5 +15061,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -14982,17 +15067,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15001,13 +15086,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15032,13 +15117,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15094,5 +15183,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15103,13 +15192,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15157,5 +15246,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15163,26 +15252,26 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15194,18 +15283,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15213,5 +15302,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15219,127 +15308,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15347,5 +15441,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15736,4 +15830,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Mesto vira sprejema" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Sprejmi iz OSM vzdolž te sledi" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Sprejmi področje" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Izberite vsaj dve vozlišči za združitev" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Berem {0}..." #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15823,5 +15952,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15904,5 +16033,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "" @@ -16447,30 +16576,31 @@ msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16582,13 +16712,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17090,9 +17220,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17135,5 +17260,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17161,10 +17286,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18344,47 +18469,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18619,14 +18744,50 @@ msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Podvojena vozlišča" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Podvojena vozlišča" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Podvojena vozlišča" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Podvojena vozlišča" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Podvojena vozlišča" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Podvojena vozlišča" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Podvojena vozlišča" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18779,59 +18940,59 @@ msgstr "Prekrivajoče poti" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19688,55 +19849,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Naloži vidne ploščice" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Spremeni ločljivost" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Shrani plast WMS v datoteko" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Naloži plast WMS iz datoteke" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19877,398 +20038,291 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 -msgid "boundary" +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" msgstr "" #. relation type #: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" +msgid "boundary" +msgstr "Regionalna cesta (1.,2. reda)" + +#. relation type +#: build/specialmessages.java:19 +msgctxt "Relation type" +msgid "enforcement" +msgstr "" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Cevovod" + +#. relation type +#: build/specialmessages.java:21 +msgctxt "Relation type" msgid "multipolygon" msgstr "" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Umetnina" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "Javni prevoz" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Opis" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +msgstr "pravilno" + +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Prilepi" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vodotok" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Posodobi" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20325,11 +20379,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Sprejmi iz OSM vzdolž te sledi" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20338,20 +20398,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20361,10 +20421,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20372,5 +20432,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20380,15 +20440,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20397,5 +20457,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20405,15 +20465,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20421,5 +20481,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20427,5 +20487,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20434,5 +20494,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20441,10 +20501,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20452,15 +20512,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20470,5 +20530,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20477,10 +20537,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20489,5 +20549,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20496,15 +20556,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20514,10 +20574,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20526,5 +20586,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20533,5 +20593,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20540,10 +20600,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20552,5 +20612,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20560,5 +20620,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20567,15 +20627,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20584,5 +20644,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27177,8 +27237,11 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Cevovod" #: build/trans_presets.java:2452 +msgctxt "Power Line" msgid "minor_line" msgstr "" @@ -32542,4 +32605,177 @@ msgstr "" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "" + #. color deprecated #. @@ -33118,7 +33354,4 @@ #~ msgstr "napačno" -#~ msgid "true" -#~ msgstr "pravilno" - #~ msgid "No document open so nothing to save." #~ msgstr "Dokument ni odprt, zato ni kaj shraniti." @@ -33177,7 +33410,4 @@ #~ msgid "Delete the selected layer." #~ msgstr "Izbriši izbrano plast." - -#~ msgid "Download Area" -#~ msgstr "Sprejmi področje" #~ msgid "" @@ -33387,7 +33617,4 @@ #~ msgstr "Vse poti so bile prazne" -#~ msgid "Error while loading page {0}" -#~ msgstr "Napaka pri nalaganju strani {0}" - #~ msgid "Open in Browser" #~ msgstr "Odpri v brskalniku" Index: applications/editors/josm/i18n/po/sv.po =================================================================== --- applications/editors/josm/i18n/po/sv.po (revision 22464) +++ applications/editors/josm/i18n/po/sv.po (revision 22465) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" "PO-Revision-Date: 2010-06-07 08:48+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: 2010-07-11 18:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -23,11 +23,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Hjälp" @@ -40,5 +40,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -71,7 +71,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -103,5 +103,5 @@ msgstr "Parametern \"downloadgps\" godtar inte filnamn eller fil URL:er." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -121,6 +121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -234,8 +234,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -245,13 +245,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -267,5 +268,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -274,5 +275,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -289,13 +291,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Avbryt" @@ -356,11 +358,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -407,6 +409,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -434,5 +437,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -556,5 +559,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -618,6 +621,6 @@ msgstr "Välj åtminstone två sträckor att slå ihop" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -626,9 +629,9 @@ msgstr "Kopiera" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Kopiera valda objekt till inklistringsbuffern." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Välj någonting att kopiera." @@ -663,6 +666,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -731,5 +734,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Skilda lager" @@ -749,5 +752,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Objekt typ:" @@ -758,5 +761,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Objekt ID:" @@ -802,5 +805,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Duplicera" @@ -948,25 +951,25 @@ msgstr "Inget överlapp funnet. Ingenting har ändrats." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "La till nod vid alla korsande sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Ta bort sträckor som inte är del av en inre multipolygon" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Korrigera relationer" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Slog ihop område som låg ovanpå sig själv" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Slog ihop områden som låg ovanpå varandra" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -976,33 +979,33 @@ "att det inte har uppstått några fel." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Ange värden för alla konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Jämka konflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Korrigera taggkonflikter" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Tog bort element från relation" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Slå ihop områden: Ta bort korta sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Sluten sträcka" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Ta bort taggar från inre sträckor" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Ytsammanslagningsfunktion" @@ -1021,5 +1024,5 @@ msgstr "Förena nod och linje" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Inget kortkommando" @@ -1375,6 +1378,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1385,17 +1388,17 @@ msgstr "Klistra in" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Klistra in innehållet i inklistringsbuffern" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Radera inkompletta medlemmar?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Klistra in utan inkompletta medlemmar" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1407,10 +1410,10 @@ "inkompletta primitiven?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Klistra in taggar" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" @@ -1418,5 +1421,5 @@ "föremål." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1425,5 +1428,5 @@ msgstr[1] "Klistrar in {0} tagar" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1492,5 +1495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1501,12 +1504,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1533,6 +1536,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Fel" @@ -1560,5 +1563,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Spara" @@ -1987,4 +1990,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Hämta data" @@ -2456,4 +2460,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2787,5 +2792,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Filter" @@ -2988,5 +2993,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3007,9 +3012,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3110,5 +3115,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Dubbel konflikt" @@ -3203,5 +3208,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3215,5 +3220,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3399,11 +3404,42 @@ msgstr "Egenskaper för " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Automatisk taggrättning" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Fel vid läsning av filer från folder {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, java-format +msgid "Unable to delete old backup file {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Fel uppstod när cache-biblioteket skulle skapas: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3605,5 +3641,5 @@ msgstr "Ö" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3611,5 +3647,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3649,5 +3685,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3688,6 +3724,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3699,5 +3734,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3709,7 +3743,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3927,7 +3960,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3935,29 +3968,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "ofullständig" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "landsväg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "järnväg" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "vattendrag" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "markanvändning" @@ -3965,7 +3998,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3977,5 +4010,5 @@ msgstr[1] "{0} noder" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -4034,6 +4067,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4041,6 +4074,6 @@ msgstr "byggnad (building)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4049,5 +4082,5 @@ msgstr[1] "{0} medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4122,5 +4155,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4221,69 +4254,69 @@ msgstr "Lösenord" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "användning" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "alternativ" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Visa denna hjälptext" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standard unix-geometri-argument" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Hämta hem området inom gränsvärdena" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Hämta området innanför gränsvärden som rå gps" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "Gör urval med angivet sökkriterium" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Öppna i maximerat läge" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Återställ inställningarna till förval" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4293,9 +4326,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "exempel" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4303,46 +4336,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Initierar" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Hämtar tidiga insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Anger förval" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Skapar huvudgränssnittet" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Hämtar insticksmoduler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Jämka" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Arkiv" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4361,10 +4410,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4372,10 +4421,11 @@ msgstr "Verktyg" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Snabbval" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4386,5 +4436,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Ljud" @@ -4651,5 +4701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4667,5 +4717,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4870,5 +4920,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "" @@ -5085,6 +5135,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5099,6 +5149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5159,17 +5209,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5240,20 +5290,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5262,5 +5314,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5272,5 +5324,5 @@ msgstr[1] "{0} sträckor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5336,5 +5388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5438,5 +5490,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5839,5 +5891,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5920,5 +5972,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6122,5 +6174,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6973,5 +7025,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7541,5 +7593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7670,5 +7722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7725,26 +7777,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7753,14 +7805,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7770,9 +7822,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7782,15 +7834,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7798,5 +7850,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7804,20 +7856,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7826,64 +7878,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Flytta vald medlem/valda medlemmar uppåt" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Flytta vald medlem/valda medlemmar nedåt" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7892,23 +7944,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7917,5 +7969,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7924,50 +7976,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7976,26 +8028,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8331,5 +8389,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9763,12 +9821,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Hämta från OSM längs med detta spår" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Hämta allting inom:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9776,8 +9838,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Största tillåtna område per begäran:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9801,4 +9865,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10246,10 +10311,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10258,5 +10323,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12462,5 +12527,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12469,53 +12534,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Mer information om denna funktion" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Valfria attribut:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "slutenväg" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Okänd typ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12525,15 +12586,15 @@ msgstr "Kunde inte läsa källan till snabbval för taggning: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Fel vid tolkning {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Objekt av typ {0} stöds." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12543,18 +12604,18 @@ msgstr[1] "Ändra {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Inget markerat!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Urvalet passar inte!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Tillämpa snabbval" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Ändra egenskaper" @@ -12569,4 +12630,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Sök: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Sök efter objekt." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Zooma till urval" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Sök: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13270,5 +13355,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13280,10 +13365,10 @@ msgstr "OSM serverfiler" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13292,5 +13377,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14017,11 +14102,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14030,16 +14115,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14048,5 +14133,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14310,5 +14395,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15030,14 +15115,14 @@ msgstr "Byggnader" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15069,5 +15154,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15124,5 +15209,5 @@ msgstr "CadastreGrabber: Ogiltig URL." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15130,5 +15215,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15137,5 +15222,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Välj en av..." @@ -15143,17 +15228,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Välj commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Automatkälla" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15162,13 +15247,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15193,13 +15278,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15255,5 +15344,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15264,13 +15353,13 @@ msgstr "vatten" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15318,5 +15407,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15324,26 +15413,26 @@ msgstr "adress" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Aktivera automatisk cachning." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Största tillåtna cachestorlek (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15355,9 +15444,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "Fransk Cadastre-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15365,10 +15454,10 @@ "källa är aktiverat." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Källa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15378,5 +15467,5 @@ "JOSM:s inställningar." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15386,127 +15475,132 @@ "gråtoner). Användbart för text på mörka bakgrunder." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Rita en rektangel runt data nedladdad från WMS-servern." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hämta mindre bilder (högre kvalitet, men mer minneskrävande)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Äldsta filerna raderas automatiskt när denna storlek överskrids" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15514,5 +15608,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15905,4 +15999,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Ladda ner objekt..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Hämta från OSM längs med detta spår" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Hämta område" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Välj åtminstone en uppgift att hämta" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Fel vid tolkning {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15992,5 +16121,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16073,5 +16202,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Uppdatera" @@ -16629,30 +16758,31 @@ msgstr "Mätningar" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16769,13 +16899,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17282,9 +17412,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17327,5 +17452,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17353,10 +17478,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18541,47 +18666,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18818,15 +18943,51 @@ msgstr "Korsande sträckor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Dubbletter av noder" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "" "Detta test kontrollerar att det inte finns några noder med precis samma läge." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Dubbletter av noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Dubbletter av noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Dubbletter av noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Dubbletter av noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Dubbletter av noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Dubbletter av noder" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18981,59 +19142,59 @@ msgstr "Överlappande sträckor" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19909,55 +20070,55 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Hämta de rutor som syns" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Ändra upplösning" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Läs om felaktiga rutor" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Alfakanal" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Spara WMS-lagret till en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Hämta WMS-lager från en fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Fel filformat" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Fel vid läsning av fil" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -20101,398 +20262,293 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "gräns" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Mätningar" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Lutning" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" -msgstr "" +msgstr "Multipolygon" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Konst" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "Kollektivtrafik" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Begränsning" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "rutt" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Klistra in" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "vattendrag" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Uppdatera" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20549,11 +20605,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Hämta från OSM längs med detta spår" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20562,20 +20624,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20585,10 +20647,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20596,5 +20658,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20604,15 +20666,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Konvertera enkelt en yta till en multipolygon." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20623,5 +20685,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20631,15 +20693,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20647,5 +20709,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20653,5 +20715,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20660,5 +20722,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20667,10 +20729,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20678,15 +20740,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20696,5 +20758,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20705,10 +20767,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20717,5 +20779,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20724,15 +20786,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20742,10 +20804,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20754,5 +20816,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20761,5 +20823,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20768,10 +20830,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20780,5 +20842,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20788,5 +20850,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20795,15 +20857,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20812,5 +20874,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27405,10 +27467,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Lutning" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "motorvägslänk" #. item "Man Made/Power Line" combo "Voltage" @@ -32770,4 +32836,177 @@ msgstr "strand" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "rutt" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "gräns" + #. color deprecated #. @@ -33286,4 +33525,7 @@ msgstr "" +#~ msgid "closedway" +#~ msgstr "slutenväg" + #~ msgid "Move" #~ msgstr "Flytta" @@ -33320,7 +33562,4 @@ #~ msgid "All the ways were empty" #~ msgstr "Alla sträckor var tomma" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Välj åtminstone en uppgift att hämta" #~ msgid "JOSM Online Help" @@ -33429,7 +33668,4 @@ #~ msgid "y from" #~ msgstr "y från" - -#~ msgid "Download Area" -#~ msgstr "Hämta område" #~ msgid "x from" Index: applications/editors/josm/i18n/po/tr.po =================================================================== --- applications/editors/josm/i18n/po/tr.po (revision 22464) +++ applications/editors/josm/i18n/po/tr.po (revision 22465) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 16:53+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-11 19:43+0000\n" "Last-Translator: Angel Spy \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: 2010-07-11 18:50+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -25,11 +25,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Yardım" @@ -42,5 +42,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -73,7 +73,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -107,5 +107,5 @@ "etmemektedir." -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -232,8 +232,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -243,13 +243,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -265,5 +266,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -272,5 +273,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -287,13 +289,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "İptal" @@ -352,11 +354,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -403,6 +405,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -430,5 +433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -552,5 +555,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -612,6 +615,6 @@ msgstr "Lütfen birleştirmek için en az iki yol seçiniz." +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -620,9 +623,9 @@ msgstr "Kopyala" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Seçili objeleri yapıştır alanına (buffer) kopyala." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Lütfen kopyalama için seçim yapınız" @@ -657,6 +660,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -725,5 +728,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Farklı Katman" @@ -743,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Nesne tipi:" @@ -752,5 +755,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Nesne ID'si :" @@ -795,5 +798,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Çift" @@ -941,25 +944,25 @@ msgstr "Kesişme bulunamadı. Hiçbir şey değiştirilmedi." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "İlişkileri düzelt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Otomatik olarak üstüste gelen alanlar birleştirildi" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Üstüste gelen alanlar birleştirildi" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -967,33 +970,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Bütün çakışmaları için yeni değerler gir." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Çakışmaları Çöz" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Etiket çakışmalarını düzelt" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Birleşme Alanları: Kısayolları Kaldır" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Kapatılmış Yol" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Birleşme Alanları Fonksiyonu" @@ -1012,5 +1015,5 @@ msgstr "Nokta ile çizgi birleştir" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Kısayol Yok" @@ -1354,6 +1357,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1364,17 +1367,17 @@ msgstr "Yapıştır" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Yapıştır hafızasındaki bilgileri yapıştır." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1383,15 +1386,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Etiketleri Yapıştır" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" "Yapıştırma hafızsında bulunan etiket içeriklerini seçili elemanlara ekle." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1399,5 +1402,5 @@ msgstr[0] "{0} etiket yapıştırılıyor" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1466,5 +1469,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1475,12 +1478,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1507,6 +1510,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Hata" @@ -1534,5 +1537,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Kaydet" @@ -1941,4 +1944,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Veriyi indir" @@ -2406,4 +2410,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2710,5 +2715,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Süzgeç" @@ -2906,5 +2911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2925,9 +2930,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "OK" @@ -3028,5 +3033,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "" @@ -3119,5 +3124,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3130,5 +3135,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "" @@ -3314,11 +3319,42 @@ msgstr "Özellikleri " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "İlişkide rolü şunu gösteriyor" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Otomatic etiket düzetmesi" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Klasörden dosya alınmasında hata oluştu {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Kananoik yol klasör için bulunamadı {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Hafıza alanı oluşturulamadı(cache): {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3520,5 +3556,5 @@ msgstr "D" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3526,5 +3562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3564,5 +3600,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3603,6 +3639,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3613,5 +3648,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3622,7 +3656,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3839,7 +3872,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3847,29 +3880,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "eksik" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "Karayolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "demiryolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "suyolu" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "arazi kullanımı" @@ -3877,7 +3910,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3888,5 +3921,5 @@ msgstr[0] "{0} Kavşak" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "" @@ -3945,6 +3978,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3952,6 +3985,6 @@ msgstr "yapılar" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3959,5 +3992,5 @@ msgstr[0] "{0} üye" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4032,5 +4065,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4132,69 +4165,69 @@ msgstr "şifre" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "kullanım" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "seçenekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Bu Yardımı Göster" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Standart unix geometry argümanı" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Kutu ile belirlenen sınırları indir" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +msgid "Open a file (any file type that can be opened with File/Open)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 -msgid "Open a file (any file type that can be opened with File/Open)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the bounding box as raw gps" msgstr "Kutu ile belirlenen alanı ham gps olarak indir" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Select with the given search" msgstr "Yapılan aramaya göre seçim yap" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +msgid "Launch in maximized mode" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 -msgid "Launch in maximized mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Reset the preferences to default" msgstr "Tercihleri varsayılan değerlere getir" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +msgid "Set the language" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 -msgid "Set the language" +msgid "options provided as Java system properties" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 -msgid "options provided as Java system properties" +msgid "/PATH/TO/JOSM/FOLDER/ " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +msgid "Change the folder for all user settings" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 -msgid "Change the folder for all user settings" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4204,9 +4237,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "örnekler" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4214,46 +4247,62 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Ayarlar Okunuyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Eski eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Varsayılan ayarlar alınıyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Arayüz Oluşturuluyor." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Eklentiler yükleniyor" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Çözümle" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Dosya" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4272,10 +4321,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4283,10 +4332,11 @@ msgstr "Araçlar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Ayarlanmış" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4297,5 +4347,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Ses" @@ -4562,5 +4612,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4578,5 +4628,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4781,5 +4831,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "" @@ -4996,6 +5046,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5010,6 +5060,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5070,17 +5120,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5151,20 +5201,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5173,5 +5225,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5182,5 +5234,5 @@ msgstr[0] "{0} Yol" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5245,5 +5297,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "" @@ -5347,5 +5399,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "" @@ -5747,5 +5799,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5828,5 +5880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6028,5 +6080,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "" @@ -6879,5 +6931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7447,5 +7499,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "" @@ -7574,5 +7626,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7629,26 +7681,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7657,14 +7709,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7674,9 +7726,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7686,15 +7738,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7702,5 +7754,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7708,20 +7760,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7730,64 +7782,64 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Seçili üyeyi yukarı taşı" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Seçili üyeyi aşağı taşı" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7796,23 +7848,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7821,5 +7873,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7828,50 +7880,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7880,26 +7932,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" msgstr "" @@ -8232,5 +8290,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9657,12 +9715,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "OSM den bu izi indir" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Bunun içindeki herşeyi indir:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9670,8 +9732,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Her istek için max. alan:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9695,4 +9759,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10132,10 +10197,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10144,5 +10209,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "" @@ -12320,5 +12385,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12327,53 +12392,49 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Seçilebilen Özellikler:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12383,15 +12444,15 @@ msgstr "Etiketteki özellikler okunamadı: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "İşleme Hatası {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12400,18 +12461,18 @@ msgstr[0] "{0} Objeyi Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Özellikleri Değiştir" @@ -12426,4 +12487,28 @@ msgid "Preset group {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Arama" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Objeleri ara." + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Seçime yakınlaş" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Objeleri ara." #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13127,5 +13212,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13137,10 +13222,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13149,5 +13234,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -13871,11 +13956,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -13884,16 +13969,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -13902,5 +13987,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14161,5 +14246,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14879,14 +14964,14 @@ msgstr "Binalar" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -14918,5 +15003,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -14973,5 +15058,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -14979,5 +15064,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -14986,5 +15071,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "" @@ -14992,17 +15077,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15011,13 +15096,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15042,13 +15127,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15104,5 +15193,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15113,13 +15202,13 @@ msgstr "su" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "" @@ -15167,5 +15256,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15173,26 +15262,26 @@ msgstr "adres" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15204,18 +15293,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15223,5 +15312,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15229,127 +15318,132 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15357,5 +15451,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15746,4 +15840,39 @@ msgid "TCX Files (*.tcx)" msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Nesneyi indir..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "OSM den bu izi indir" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Alanı indir" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "Lütfen en az bir indirme görevi seçiniz" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Ayrıştırmada hata {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -15833,5 +15962,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -15914,5 +16043,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Yenile" @@ -16466,30 +16595,31 @@ msgstr "ölçümler" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "" @@ -16603,13 +16733,13 @@ msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17115,9 +17245,4 @@ msgstr "" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17160,5 +17285,5 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17186,10 +17311,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18369,47 +18494,47 @@ msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -18644,14 +18769,50 @@ msgstr "kesişine yollar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Çift Noktalar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Çift Noktalar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Çift Noktalar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Çift Noktalar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Çift Noktalar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Çift Noktalar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Çift Noktalar" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "" @@ -18805,59 +18966,59 @@ msgstr "Üstüste gelen yollar" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "" @@ -19723,9 +19884,9 @@ msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Görünen mozaikleri indir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -19734,46 +19895,46 @@ "değiştirin" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Çözünürlüğü değiştir" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "WMS tabakasını dosyaya kaydet" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "WMS tabakasını dosyadan yükle" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Dosya Format Hatası" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Dosya Yüklemede Sorun" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "" @@ -19918,398 +20079,292 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "sınırlar" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "ölçümler" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "Suboru Hattı" + +#. relation type +#: build/specialmessages.java:21 +msgctxt "Relation type" msgid "multipolygon" msgstr "" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Sanatsal" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "toplu_taşıma_hatları" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "varış" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "rut" -#. Strings in JFileChooser -#: build/specialmessages.java:21 -msgid "All Files" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:22 -msgid "Attributes" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:23 -msgid "Abort file chooser dialog" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:24 -msgid "Abort file chooser dialog." -msgstr "" - -#. Strings in JFileChooser +#. relation type #: build/specialmessages.java:26 -msgid "Create New Folder" -msgstr "" - -#. Strings in JFileChooser +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "Yapıştır" + +#. relation type #: build/specialmessages.java:27 -msgid "Delete File" -msgstr "" +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "suyolu" #. Strings in JFileChooser #: build/specialmessages.java:29 -msgid "Enter file name:" +msgid "All Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:30 -msgid "Enter path or folder name:" +msgid "Attributes" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:31 -msgid "Error " +msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:32 -#, java-format -msgid "Error renaming file \"{0}\" to \"{1}\"" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:33 -msgid "File name:" +msgid "Abort file chooser dialog." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:34 -msgid "File Name:" +msgid "Create New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:35 -msgid "FileChooser help." -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:36 -msgid "Files" +msgid "Delete File" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:37 -msgid "Files of type:" +msgid "Enter file name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:38 -msgid "Files of Type:" +msgid "Enter path or folder name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:39 +msgid "Error " msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:40 -msgid "Filter:" +#, java-format +msgid "Error renaming file \"{0}\" to \"{1}\"" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:41 -msgid "Folders" +msgid "File name:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:42 +msgid "File Name:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:43 -msgid "Home" +msgid "FileChooser help." msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:44 -msgid "List" +msgid "Files" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:45 -msgid "Look in:" +msgid "Files of type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:46 -msgid "Look In:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:47 -msgid "Modified" +msgid "Files of Type:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:48 -msgid "New Folder" +msgid "Filter:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:49 +msgid "Folders" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:51 +msgid "Home" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:52 -msgid "Open selected file" +msgid "List" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:53 -msgid "Open selected file." +msgid "Look in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:54 +msgid "Look In:" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:55 -msgid "Rename File" +msgid "Modified" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:56 -#, java-format -msgid "Rename file \"{0}\" to" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:58 -msgid "Save in:" -msgstr "" - -#. Strings in JFileChooser -#: build/specialmessages.java:59 -msgid "Save In:" +msgid "New Folder" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:60 -msgid "Save selected file." +msgid "Open selected file" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:61 -msgid "Selection:" +msgid "Open selected file." msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:62 -msgid "Size" +#: build/specialmessages.java:63 +msgid "Rename File" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:65 -msgid "Up One Level" +#: build/specialmessages.java:64 +#, java-format +msgid "Rename file \"{0}\" to" msgstr "" #. Strings in JFileChooser #: build/specialmessages.java:66 +msgid "Save in:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:67 +msgid "Save In:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:68 +msgid "Save selected file." +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:69 +msgid "Selection:" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:70 +msgid "Size" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:73 +msgid "Up One Level" +msgstr "" + +#. Strings in JFileChooser +#: build/specialmessages.java:74 msgid "Update" msgstr "Güncelle" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "" @@ -20366,11 +20421,17 @@ msgstr "" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "OSM den bu izi indir" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20379,20 +20440,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20402,10 +20463,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20413,5 +20474,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20421,15 +20482,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20438,5 +20499,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20446,15 +20507,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20462,5 +20523,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20468,5 +20529,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20475,5 +20536,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20482,10 +20543,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20493,15 +20554,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20511,5 +20572,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20518,10 +20579,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20530,5 +20591,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20537,15 +20598,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20555,10 +20616,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20567,5 +20628,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20574,5 +20635,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20581,10 +20642,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20593,5 +20654,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20601,5 +20662,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20608,15 +20669,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20625,5 +20686,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27218,10 +27279,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "Suboru Hattı" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "otoyol_hat" #. item "Man Made/Power Line" combo "Voltage" @@ -32583,4 +32648,177 @@ msgstr "sahil" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "rut" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "sınırlar" + #. color deprecated #. @@ -33188,7 +33426,4 @@ #~ msgstr "y burdan" -#~ msgid "Download Area" -#~ msgstr "Alanı indir" - #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." #~ msgstr "Fare veya Ctrl+ok tuşları ile /./ zoom ve pan yapabilirsin." @@ -33553,7 +33788,4 @@ #~ msgid "Data Layer" #~ msgstr "Bilgi Tabakası" - -#~ msgid "Please select at least one task to download" -#~ msgstr "Lütfen en az bir indirme görevi seçiniz" #~ msgid "Really mark this issue as ''done''?" Index: applications/editors/josm/i18n/po/uk.po =================================================================== --- applications/editors/josm/i18n/po/uk.po (revision 22464) +++ applications/editors/josm/i18n/po/uk.po (revision 22465) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 16:21+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-22 06:56+0000\n" +"Last-Translator: andygol \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\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: 2010-07-11 18:49+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -24,11 +24,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "Довідка" @@ -41,5 +41,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -72,7 +72,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ msgstr "Параметр \"downloadgps\" не приймає імена файлів або URL-адреси файлів" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -237,8 +237,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -248,13 +248,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -270,5 +271,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -277,5 +278,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -292,13 +294,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "Скасувати" @@ -361,11 +363,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -412,6 +414,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -439,5 +442,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -561,5 +564,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -621,6 +624,6 @@ msgstr "Будь ласка, виберіть принаймні дві лінії для з’єднання" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -629,9 +632,9 @@ msgstr "Копіювати" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "Копіювати виділені об’єкти до буферу обміну." -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "Будь ласка, виберіть що-небудь для копіювання." @@ -665,6 +668,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -733,5 +736,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "Окремий шар" @@ -753,5 +756,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "Тип об’єкту:" @@ -762,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "Ідентифікатор об’єкту:" @@ -805,5 +808,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "Дублювати" @@ -953,25 +956,25 @@ msgstr "Не знайдено перетинів. Нічого не змінено." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "Додані на всіх перетинах точки" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "Вилучити лінії, що не належать до внутрішньої частини мультиполігону" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "Виправити зв’язки" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "Приєднана ділянка, що перекриває сама себе" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "Об’єднані ділянки, що перекриваються" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -981,33 +984,33 @@ "чи не виникло помилок." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "Введіть значення для всіх конфліктів." -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "Розв’язати конфлікти" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "Виправити конфлікти теґів" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "Вилучений зі зв’язків елемент" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "Об’єднати ділянки: вилучити короткі лінії" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "Замкнена лінія" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "Вилучити теґи з внутрішніх ліній" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "Функція об’єднання ділянок" @@ -1026,5 +1029,5 @@ msgstr "З’єднати точку і лінію" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "Відсутній ярлик" @@ -1398,6 +1401,6 @@ msgstr "Будь ласка, виберіть ліній з кутами, близькими до 90 або 180 градусів." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1408,17 +1411,17 @@ msgstr "Вставити" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "Вставити вміст буферу." -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "Вилучити неповних членів?" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "Вставити без неповних членів" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1429,14 +1432,14 @@ "будуть вилучені. Чи бажаєте ви вставити дані без неповних елементів?" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "Вставити теґи" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "Застосувати теґи з буферу до всіх виділених об’єктів." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1446,5 +1449,5 @@ msgstr[2] "Вставляється {0} теґів" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1514,5 +1517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1523,12 +1526,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1555,6 +1558,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "Помилка" @@ -1582,5 +1585,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "Зберегти" @@ -2019,4 +2022,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "Отримати дані" @@ -2403,5 +2407,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93 msgid "Draw nodes" -msgstr "Зобразити точки" +msgstr "Креслити точки" #. Add extra shortcut N @@ -2515,4 +2519,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2851,5 +2856,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "Фільтр" @@ -2875,8 +2880,11 @@ " {0}" msgstr "" +"Помилковий вираз для пошуку: \n" +"\n" +" {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 msgid "Invalid search expression" -msgstr "" +msgstr "Помилковий вираз для пошуку" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -3060,5 +3068,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -3079,9 +3087,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "Так" @@ -3185,5 +3193,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "Подвійний конфлікт" @@ -3282,5 +3290,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3294,5 +3302,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "Підтвердження вилучення" @@ -3487,11 +3495,42 @@ msgstr "Властивості " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "Ролі в зв’язках, що відносяться до" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "Автоматичне виправлення теґів" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "Помилка читання файлів з каталогу {0}\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "Замінити старі резервні копії?" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "Помилка створення каталогу для кешу: {0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3719,5 +3758,5 @@ msgstr "Сх" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3725,5 +3764,5 @@ msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3766,5 +3805,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3809,6 +3848,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3821,5 +3859,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3832,7 +3869,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -4055,7 +4091,7 @@ msgstr "Не показувати знову (запам’ятати вибір)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -4063,29 +4099,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "неповний елемент" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "дорога" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "залізниця" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "водний шлях" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "землекористування" @@ -4093,7 +4129,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -4106,5 +4142,5 @@ msgstr[2] "{0} точок" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "громадський транспорт" @@ -4163,6 +4199,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -4170,6 +4206,6 @@ msgstr "будівля" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -4179,5 +4215,5 @@ msgstr[2] "{0} членів" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4252,5 +4288,5 @@ msgstr "Об’єкт вилучено" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4353,30 +4389,30 @@ msgstr "Пароль" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "використання" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "параметри" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "Показати цю довідку" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "Стандартний аргумент геометрії unix" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "Завантажити ділянку в межах габаритного прямокутника" +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" +msgstr "" +"Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z)" + #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 -msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" -msgstr "" -"Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z)" - -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "" @@ -4384,9 +4420,9 @@ "Файл/Відкрити)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "Завантажити ділянку в межах габаритного прямокутника, як дані GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "" @@ -4394,33 +4430,33 @@ "дані GPS" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "Вибір з урахуванням пошуку" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "Запуск у розгорнутому вигляді" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "Відновити типові налаштування" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "Встановити мову" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "системні налаштування Java" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "ШЛЯХ/ДО/ПАПКИ/JOSM/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "Зміна папки для всіх налаштувань користувача" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4434,9 +4470,9 @@ "виділеної пам’яті" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "приклади" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4446,5 +4482,5 @@ "порядку." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "" @@ -4452,33 +4488,49 @@ "selection." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "Ініціалізація" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "Оновлення втулків…" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "Встановлення оновлених втулків" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "Завантаження ранніх втулків" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "Типові налаштування" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "Створення головного вікна" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "Завантаження втулків" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "Розв’язано" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." @@ -4487,9 +4539,9 @@ "використовується." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "Файл" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4508,10 +4560,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4519,10 +4571,11 @@ msgstr "Інструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "Заготовки" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4533,5 +4586,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "Звук" @@ -4814,5 +4867,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4830,5 +4883,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -5053,5 +5106,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "Вгору" @@ -5283,6 +5336,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5297,6 +5350,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5358,17 +5411,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "Відмінити розв’язання конфліктів" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "Застосувати розв’язки конфліктів" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5439,20 +5492,22 @@ msgstr "Кофлікти у вставлених теґах" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "Вставити…" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "З…" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "В…" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5462,5 +5517,5 @@ msgstr[2] "{0} теґів" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5473,5 +5528,5 @@ msgstr[2] "{0} ліній" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5540,5 +5595,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "Значення:" @@ -5657,5 +5712,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "Подробиці" @@ -5841,5 +5896,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57 msgid "Error in filter" -msgstr "" +msgstr "Помилка у фільтрі" #. translators notes must be in front @@ -6066,5 +6121,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "Створити копію цього зв’язку і відкрити його в іншому вікні редактора" @@ -6147,5 +6202,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6357,5 +6412,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "Відкрити" @@ -7215,5 +7270,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7827,5 +7882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<інший>" @@ -7959,5 +8014,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -8020,26 +8075,26 @@ msgstr "({0}/{1}): Завантаження зв’язку ''{2}''…" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "Теґи та члени" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "Батьківські зв’язки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "Підпорядковані зв’язки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "Застосувати роль:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "Ввести роль та застосувати її до виділених членів зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -8051,14 +8106,14 @@ "циклічними залежностями?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "Вилучити їх із зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "Ігнорувати, залишити зв’язок як є" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -8071,9 +8126,9 @@ "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "Кілька членів посилаються на один і той же елемент" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -8086,5 +8141,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -8092,5 +8147,5 @@ "Додати всі елементи, виділені в поточному наборі даних, перед першим членом" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -8099,5 +8154,5 @@ "члена" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -8107,5 +8162,5 @@ "виділеним членом" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -8115,20 +8170,20 @@ "виділеного члена" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "Вилучити всіх членів, що відносяться до любого з виділених елементів" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "Редактор зв’язків: Вилучити виділене" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Виділити членів зв’язку, які відносяться до вибраних елементів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -8139,64 +8194,64 @@ "елементів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "Виділити елементи для виділених членів зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "Впорядкувати членів зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "Впорядкувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "Редактор зв’язків: Впорядкувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "Змінити порядок членів зв’язку на протилежний" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "У зворотному порядку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "Редактор зв’язків: Навпаки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "Перемістити обраних членів вгору" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "Редактор зв’язків: Підняти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "Перемістити обраних членів вниз" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "Редактор зв’язків: Опустити" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "Вилучити виділених членів зі зв’язку" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "Редактор зв’язків: Вилучити" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "Вилучити зв’язок, що редагується" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -8208,24 +8263,24 @@ "був відкритий. Вони були вилучені зі списку членів зв’язку." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "Так, створити конфлікт і закрити" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "Натисніть, щоб створити конфлікт і закрити редактор зв’язків" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "Ні, продовжити редагування" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" "Клацніть аби повернутися до редактора зв’язків та продовжити редагування" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8237,5 +8292,5 @@ "конфлікт та закрити редактор?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -8246,50 +8301,50 @@ "розв’яжіть конфлікти, а потім спробуйте ще раз." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "Застосувати поточні оновлення" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "Застосувати оновлення і закрити діалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "Скасувати оновлення та закрити діалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "Додати порожній теґ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "Завантажити усіх неповних членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "Завантажити членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "Редактор зв’язків: Завантажити членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "Завантажити виділених неповних членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "Встановити роль для виділених членів" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "Застосувати роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8299,27 +8354,33 @@ msgstr[2] "Ви призначити пусту роль {0} елементам." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "Це дорівнює вилученю ролі цих елементів." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "Ви дійсно бажаєте, застосувати нову роль?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "Так, застосовувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "Ні, не застосовувати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "Підтвердити порожню роль" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "Виділений, при редагуванні зв’язку, член відноситься до" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8667,5 +8728,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -10272,12 +10333,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "Завантажити з OSM дані уздовж цього треку" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "Завантажити всі в межах:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -10285,8 +10350,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "Максимальна ділянка для одного запиту:" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -10310,4 +10377,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10774,10 +10842,10 @@ msgstr[2] "{0} знайдено, з GPS позначками." -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "Вилучити зображення з диску" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10788,5 +10856,5 @@ "втрачено!" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "Не можливо вилучити файл зображення" @@ -13184,5 +13252,5 @@ msgstr "Додати новий теґ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -13193,53 +13261,49 @@ "повинна бути такою ж, як і у values" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "Більш детальна інформація про цю функцію" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "Невідомий запит: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "Доступні ролі" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "роль" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "кількість" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "елементи" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "Необов’язкові атрибути:" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "замкнена лінія" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "Невідомий тип: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "Роль елемента заготовки без батьків" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "Вкладені елементи заготовок без батьків" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -13249,15 +13313,15 @@ msgstr "Неможливо прочитати з джерела заготовок теґів: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "Помилка синтаксичного аналізу: {0} " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "Елементи типу {0} підтримуються." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -13268,18 +13332,18 @@ msgstr[2] "Правка {0} об’єктів" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "Нічого не вибрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "Невдалий вибір!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "Застосувати заготовку" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "Змінити параметри" @@ -13294,4 +13358,28 @@ msgid "Preset group {0}" msgstr "Група заготовок {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "Пошук: " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "Пошук об’єктів" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "Показати локалізовані назви в переліку вибору" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "Пошук: " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -14055,5 +14143,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -14065,10 +14153,10 @@ msgstr "Файли серверу OSM" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "Виникла помилка під час збереження.
Помилка:
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -14079,5 +14167,5 @@ "
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14867,11 +14955,11 @@ msgstr "Завантажити список втулків…" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "Завантаження списоку втулків з ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14882,16 +14970,16 @@ "записати у кеш список втулків з сайту ''{1}''." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "Запис списку втулків в локальний кеш ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "Розбір списку втулків з сайту ''{0}''" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14902,5 +14990,5 @@ "Сайт пропущено. Помилка: {1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -15231,5 +15319,5 @@ "об’єкт.

Повідомлення про помилку:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16050,5 +16138,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 msgid "on polygon" -msgstr "" +msgstr "у багатокутнику" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 @@ -16058,5 +16146,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 msgid "Helping tool for tag address" -msgstr "" +msgstr "Допоміжний інструмент для теґів адреси" #. group "Man-Made" @@ -16067,14 +16155,14 @@ msgstr "Будівлі" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +msgstr "Наступний номер" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Вулиця" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "Ввести адреси" @@ -16111,5 +16199,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "Виберіть шар" @@ -16168,5 +16256,5 @@ msgstr "CadastreGrabber: Не дійсне посилання." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -16176,5 +16264,5 @@ "Сервер на обслуговуванні або тимчасового перевантажений." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -16185,5 +16273,5 @@ "або дію відмінено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "Виберіть з…" @@ -16191,17 +16279,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "Виберіть загальне" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Кадастр" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "Автоматичні джерела" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -16213,13 +16301,13 @@ "Ви бажаєте назначити на клавішу F11 функцію захопленя?" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "Відновити дію захоплення клавішею F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM зупиняється, щоб зміни вступили в силу." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -16246,15 +16334,20 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "Відключити обрізку зображень під час гео-прив’язування" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "Виберіть перший шар WMS зі списку" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" +"Не використовувати зв’язки для адрес (крім, \"addr:street\" у елементів)" #. item "Man Made/Pipeline" combo "Type" @@ -16308,5 +16401,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -16317,13 +16410,13 @@ msgstr "вода" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "символ" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "ділянка" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "номер ділянки" @@ -16371,5 +16464,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -16377,26 +16470,26 @@ msgstr "адреса" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "місце знаходження" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "розділ" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "община" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "Увімкнути автоматичне кешування." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "Макс. розмір кешу (МБ)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16414,19 +16507,19 @@ "яких даних, створених за допомогою цього втулка." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "WMS французького кадастру" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Значення теґу \"source\", коли включені автоматичні джерела" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "Джерело" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16435,5 +16528,5 @@ "Замінити оригінальний білий фон на колір фону, заданий у налаштуваннях JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16443,62 +16536,62 @@ "Корисно для текстів на темному тлі." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "Дозволити нашарування кількох шарів" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Встановити прозорість шарів WMS. Праворуч — непрозорий, ліворуч — прозорий." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Показувати прямокутник навколо даних, завантажених з сервера WMS." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "Роздільна здатність зображення:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "Висока роздільна здатність (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "Середня роздільна здатність (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "Низька роздільна здатність (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "Фільтр інтерполяції зображень:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Найближчий-Сусід (дуже швидко) [типово]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "Білінійна (швидко)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "Бікубічна (повільно)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "Коефіцієнт захвату векторних зображень:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "Захопити весь екран в одне зображення" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" @@ -16506,63 +16599,68 @@ "пам’яті)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "Фіксований розмір площі (типово 100 м)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фіксований розмір (від 25 до 1000 метрів)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "Шари:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "Моря, ріки, басейни" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "Будівлі, сховища, підземні споруди." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "Символ, наприклад християнський хрест" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "Ділянки." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "Номера ділянок, назви вулиць." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "Адреси, номери будівель" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "Населений пункт, хутір, селище." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "Розділи і підрозділи кадастру." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "Муніципальні адміністративні кордони." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "Коефіцієнт захвату растрових зображень:" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "Показати перемички:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16570,5 +16668,5 @@ "перевищено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16578,7 +16676,7 @@ "шарів." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." -msgstr "" +msgstr "Увімкніть для можливості використання \"add:street\" на точках." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -16993,4 +17091,40 @@ msgid "TCX Files (*.tcx)" msgstr "TCX файли (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "Завантажити об’єкт…" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "Завантажити дані мапи, що лежать на кінці обраної лінії" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "Завантажити зараз" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "" +"Будь ласка, виберіть 4 або 5 ліній, щоб призначити заборону повороту ліворуч." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "Тест {0}/{1}: Виконується {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "Помилка при розборі {0}: {1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -17080,5 +17214,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "Використовувати зовнішні сценарії в JOSM" @@ -17161,5 +17295,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "Оновити" @@ -17724,31 +17858,32 @@ msgstr "Вимірювання" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "Мічиганський поворот ліворуч" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "Додає заборону повороту ліворуч на групу з 4 або 5 ліній." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" "Будь ласка, виберіть 4 або 5 ліній, щоб призначити заборону повороту ліворуч." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "Будь ласка, виділить 4 лінії, що утворюють закрити’ зв’язок." -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "Не можливо впорядкувати лінії. Будь ласка, перевірте їх напрямки" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "Створити обмеження повороту ліворуч (Мічіган)" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "Неможливо знайти точки «через». Будь ласка, перевірте свій вибір" @@ -17868,13 +18003,13 @@ msgstr "Черга" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "автономний режим" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "в мережі" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -18216,9 +18351,9 @@ #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 msgid "Create Stops from GTFS ..." -msgstr "" +msgstr "Створити зупинки з GTFS …" #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 msgid "Create Stops from a GTFS file" -msgstr "" +msgstr "Створити зупинки із файлу GTFS" #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 @@ -18230,5 +18365,5 @@ #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 msgid "GTFS-Stops" -msgstr "" +msgstr "GTFS-Зупинки" #. item "Bicycle/Rental" text "Name" @@ -18388,9 +18523,4 @@ msgstr "Відсутній об’єкт злиття для {0} з ідентифікатором {1}" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -18436,5 +18566,5 @@ msgstr "Повернути набір змін #{0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "Втулок Дорожні знаки" @@ -18462,10 +18592,10 @@ msgstr "Помилка розбору заготовок теґів з ''{0}'':\n" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "Знак {0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -19746,47 +19876,47 @@ msgstr "Перейдіть до Базового редактора та виділіть лінію OSM" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "Відновити об’єкт…" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "Відновити об’єкт за ідентифікатором" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "Виділіть, якщо треба щоб данні додавались до нового шару" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "Введіть ідентифікатор об’єкту який потрібно відновити" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "Відновити об’єкт" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "Відновити об’єкт" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "Розпочати відновлення" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "Закрити діалог та скасувати" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "Очікується {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "Шукаємо {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -20026,14 +20156,50 @@ msgstr "Перетин ліній" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "Подвійні точки" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "Цей тест перевіряє на наявність однакових точок в одному місці." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "Об’єднати дублікати точок?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "Подвійні точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "Подвійні точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "Об’єднати дублікати точок?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "Подвійні точки" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "Об’єднати дублікати точок?" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "Точки з тими же координатами" @@ -20191,59 +20357,59 @@ msgstr "Перетин ліній" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "Перевірка зв’язків:" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "Цей втулок перевіряє зв’язки на наявність помилок." -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "Тип зв’язку невідомий" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "Зв’язок порожній" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "<порожньо>" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "Відсутня роль {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "Проблеми перевірки ролі" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "Номер ролі {0} занизький ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "Номер ролі {0} зависокий ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "Помилковий тип члену ролі {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "Невідома роль {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "Знайдено порожню роль" @@ -21138,9 +21304,9 @@ msgstr "Невірний URL?" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "Завантажити видимі квадрати мапи" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -21149,46 +21315,46 @@ "змініть розподільчу здатність" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "Змінити розподільчу здатність" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "Перезавантажити помилкові квадрати" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "Альфа-канал" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "Зберегти шар WMS у файл" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "Зберегти шар WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "Завантажити шар WMS з файлу" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "Завантажити шар WMS" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "Непідтримувана версія файлу WMS; знайдено {0}, очікувалось {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "Помилка формату файлу" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "Помилка завантаження файлу" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "Встановити закладку WMS" @@ -21335,231 +21501,127 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "створити зв’язок associatedStreet" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "кордон" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "Збільшення" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "високовольтна" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "мультиполігон" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "Мережа" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "громадський транспорт" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Обмеження" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "маршрут" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "місцевість" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "водний шлях" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "Всі файли" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "Атрибути" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "Закрити діалогове вікно вибору файла" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "Перервати роботу діалогу вибору файлів." #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "Створити теку" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "Вилучити файл" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "Введіть ім’я файлу:" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "Введіть шлях або ім’я теки:" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "Помилка " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -21567,90 +21629,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "Ім’я файлу:" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "Ім’я файлу:" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "Довідка з вибору файлу." #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "Файли" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "Файли типу:" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "Файли типу:" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "Фільтр:" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "Теки" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "Домівка" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "Список" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "Дивитись у:" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "Шукати у:" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "Змінено" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "Нова тека" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "Відкрити обраний файл" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "Відкрити виділений файл." #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "Перейменувати файл" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -21658,75 +21720,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "Зберегти у:" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "Зберегти у:" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "Зберегти виділений файл." #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "Виділення:" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "Розмір" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "Рівнем вище" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "Оновити" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "Оновити теку." #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "Синій:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "Колір:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "Зелений:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "Відтінок:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "Вибір кольору GTK" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "Червоний:" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "Насиченість:" @@ -21793,11 +21855,17 @@ "на openstreetmap.org." +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "Завантажити з OSM дані уздовж цього треку" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "Дублювати лінії зі зміщенням" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -21808,5 +21876,5 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "" @@ -21815,15 +21883,15 @@ #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "Показує інформацію про маршрут у вигляді маршрутної діаграми." #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "Впроваджує шар тла, якій показує сітку на мапі" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -21836,10 +21904,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "Допомагає оцифровувати (векторизувати) зображення WMS." #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -21849,5 +21917,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -21860,15 +21928,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "Додає заборону повороту ліворуч для наборів з 4 або 5 ліній" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "Легко перетворює ділянку у мультиполігон." #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -21879,5 +21947,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -21890,15 +21958,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "Показує тло OpenLayers" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "Імпорт питань з OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -21908,5 +21976,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -21914,5 +21982,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -21923,5 +21991,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -21932,10 +22000,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "Чудовий JGoodies Пластиковий Скін." #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -21944,15 +22012,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "Дозволяє іншим застосункам посилати команди JOSM." #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "Втулок для відміни наборів змін" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -21960,7 +22028,10 @@ "properties window. Available country presets: Germany." msgstr "" +"Втулок для позначення об’єктів дорожніми знаками. Діалог відкривається після " +"клацання на маленький значок у правому верхньому куті вікна властивостей. " +"Доступні заготовки: Німеччина." #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21971,10 +22042,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "Надає можливості маршрутизації." #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21986,5 +22057,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21995,15 +22066,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "Дозволяє додавати мітки/точки в поточній позиції GPS ." #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показує вікно для редагування теґів в табличному вигляді." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22016,10 +22087,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "Зробити ряд будинків по вулиці з одного блоку." #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22031,5 +22102,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22040,5 +22111,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22049,10 +22120,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22063,5 +22134,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22074,5 +22145,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22083,15 +22154,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22102,5 +22173,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -27184,5 +27255,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "american_football" -msgstr "" +msgstr "американський футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27214,5 +27285,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canadian_football" -msgstr "" +msgstr "канадський футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27259,5 +27330,5 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "gaelic_football" -msgstr "" +msgstr "гаельський футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27299,10 +27370,10 @@ #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "rugby_league" -msgstr "" +msgstr "ліга регбі" #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "rugby_union" -msgstr "" +msgstr "союз регбі" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27793,46 +27864,46 @@ #: build/trans_presets.java:2076 msgid "American Football" -msgstr "" +msgstr "Американський футбол" #. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 msgid "Edit American Football" -msgstr "" +msgstr "Властивості Американського футболу" #: build/trans_presets.java:2082 msgid "Canadian Football" -msgstr "" +msgstr "Канадський футбол" #. item "Sport (Ball)/Canadian Football" #: build/trans_presets.java:2083 msgid "Edit Canadian Football" -msgstr "" +msgstr "Властивості Канадського футболу" #: build/trans_presets.java:2088 msgid "Gaelic Football" -msgstr "" +msgstr "Гаельський футбол" #. item "Sport (Ball)/Gaelic Football" #: build/trans_presets.java:2089 msgid "Edit Gaelic Football" -msgstr "" +msgstr "Властивості Гаельського футболу" #: build/trans_presets.java:2094 msgid "Rugby League" -msgstr "" +msgstr "Ліга регбі" #. item "Sport (Ball)/Rugby League" #: build/trans_presets.java:2095 msgid "Edit Rugby League" -msgstr "" +msgstr "Властивості Ліги регбі" #: build/trans_presets.java:2100 msgid "Rugby Union" -msgstr "" +msgstr "Союз регбі" #. item "Sport (Ball)/Rugby Union" #: build/trans_presets.java:2101 msgid "Edit Rugby Union" -msgstr "" +msgstr "Властивості Союзу регбі" #: build/trans_presets.java:2106 @@ -28697,8 +28768,12 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" msgstr "високовольтна" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" msgstr "середньої/низької напруги" @@ -34062,4 +34137,177 @@ msgstr "пляж" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "маршрут" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "кордон" + #. color deprecated #. @@ -34577,4 +34825,10 @@ msgid "Sicily - Italy" msgstr "Італія – Сицилія" + +#~ msgid "closedway" +#~ msgstr "замкнена лінія" + +#~ msgid "Target of type {0} with id {1} has invalid version" +#~ msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію" #~ msgid "Error: {0}" Index: applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- applications/editors/josm/i18n/po/zh_TW.po (revision 22464) +++ applications/editors/josm/i18n/po/zh_TW.po (revision 22465) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-11 21:01+0200\n" -"PO-Revision-Date: 2010-07-06 16:35+0000\n" +"POT-Creation-Date: 2010-07-28 11:53+0200\n" +"PO-Revision-Date: 2010-07-27 04:35+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: 2010-07-11 18:49+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 09:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" @@ -24,11 +24,11 @@ #: ../core/src/org/openstreetmap/josm/Main.java:213 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:490 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 -#: build/specialmessages.java:42 +#: build/specialmessages.java:50 msgid "Help" msgstr "說明" @@ -41,5 +41,5 @@ #: ../core/src/org/openstreetmap/josm/Main.java:441 #: ../core/src/org/openstreetmap/josm/Main.java:474 -#: ../core/src/org/openstreetmap/josm/Main.java:542 +#: ../core/src/org/openstreetmap/josm/Main.java:561 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -72,7 +72,7 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 @@ -104,5 +104,5 @@ msgstr "參數「downloadgps」不能使用檔案名稱或檔案 URL" -#: ../core/src/org/openstreetmap/josm/Main.java:541 +#: ../core/src/org/openstreetmap/josm/Main.java:560 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -122,6 +122,6 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799 @@ -235,8 +235,8 @@ #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 @@ -246,13 +246,14 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376 @@ -268,5 +269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -275,5 +276,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119 @@ -290,13 +292,13 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 -#: build/specialmessages.java:25 +#: build/specialmessages.java:33 msgid "Cancel" msgstr "取消" @@ -355,11 +357,11 @@ #. #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16 @@ -406,6 +408,7 @@ #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50 @@ -433,5 +436,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 @@ -555,5 +558,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 #, java-format msgid "File: {0}" @@ -613,6 +616,6 @@ msgstr "請選擇至少兩個以上的路徑來合併" +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323 @@ -621,9 +624,9 @@ msgstr "複製" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28 msgid "Copy selected objects to paste buffer." msgstr "複製選取的物件到剪貼簿" -#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79 msgid "Please select something to copy." msgstr "請選擇物件" @@ -656,6 +659,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -724,5 +727,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69 msgid "Separate Layer" msgstr "另外的圖層" @@ -742,5 +745,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 msgid "Object type:" msgstr "物件類型：" @@ -751,5 +754,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85 msgid "Object ID:" msgstr "物件 ID：" @@ -794,5 +797,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 msgid "Duplicate" msgstr "重製" @@ -939,25 +942,25 @@ msgstr "找不到交叉點。沒有東西變更。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200 msgid "Added node on all intersections" msgstr "在所有的交叉點加入節點" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "刪除不屬於內部多重多邊形一部分的路徑" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234 msgid "Fix relations" msgstr "修正關係" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239 msgid "Joined self-overlapping area" msgstr "已連結自我重疊的區域" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 msgid "Joined overlapping areas" msgstr "已連結重疊的區域" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -965,33 +968,33 @@ msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307 msgid "Enter values for all conflicts." msgstr "輸入所有衝突項目的數值。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Solve Conflicts" msgstr "解決衝突" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323 msgid "Fix tag conflicts" msgstr "修正標籤的衝突" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486 msgid "Removed Element from Relations" msgstr "從關係中移除元件" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610 msgid "Join Areas: Remove Short Ways" msgstr "連結區域：移除短路徑" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630 msgid "Closed Way" msgstr "封閉的路徑" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934 msgid "Remove tags from inner ways" msgstr "移除內部路徑的標籤" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966 msgid "Join Areas Function" msgstr "連結區域功能" @@ -1010,5 +1013,5 @@ msgstr "連結節點與直線" -#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45 +#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44 msgid "No Shortcut" msgstr "沒有捷徑鍵" @@ -1360,6 +1363,6 @@ msgstr "請選擇角度大約為 90 或 180 度的路徑。" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233 @@ -1370,17 +1373,17 @@ msgstr "貼上" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 msgid "Paste contents of paste buffer." msgstr "從剪貼緩衝區貼上內容。" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" msgstr "是否刪除不完整的成員？" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" msgstr "貼上時不包含不完整的成員" -#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1391,14 +1394,14 @@ "有不完整原型的資料嗎？" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32 -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" msgstr "貼上標籤" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "將剪貼緩衝區的標籤套用到所有選取的項目上。" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 #, java-format msgid "Pasting {0} tag" @@ -1406,5 +1409,5 @@ msgstr[0] "正在貼上 {0} 標籤" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111 #, java-format msgid "to {0} primitive" @@ -1472,5 +1475,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -1481,12 +1484,12 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:60 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:108 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100 -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461 @@ -1513,6 +1516,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451 msgid "Error" msgstr "錯誤" @@ -1540,5 +1543,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248 -#: build/specialmessages.java:57 +#: build/specialmessages.java:65 msgid "Save" msgstr "存檔" @@ -1942,4 +1945,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231 msgid "Download data" msgstr "下載資料" @@ -2405,4 +2409,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108 @@ -2721,5 +2726,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 -#: build/specialmessages.java:39 +#: build/specialmessages.java:47 msgid "Filter" msgstr "過濾條件" @@ -2924,5 +2929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 @@ -2943,9 +2948,9 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686 -#: build/specialmessages.java:50 +#: build/specialmessages.java:58 msgid "OK" msgstr "確定" @@ -3047,5 +3052,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142 msgid "Double conflict" msgstr "雙重衝突" @@ -3134,5 +3139,5 @@ #. connection. #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3145,5 +3150,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356 msgid "Delete confirmation" msgstr "刪除動作確認" @@ -3327,11 +3332,42 @@ msgstr "屬性 " -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113 msgid "Roles in relations referring to" msgstr "關係中的角色參照到" -#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133 +#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" msgstr "自動修正標籤" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71 +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75 +#, java-format +msgid "Unable to create directory {0}, autosave will be disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137 +#, java-format +msgid "Unable to create file {0}, other filename will be used" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140 +#, fuzzy, java-format +msgid "IOError while creating file, autosave will be skipped: {0}" +msgstr "從目錄 {0} 取得檔案時發生錯誤\n" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162 +#, fuzzy, java-format +msgid "Unable to delete old backup file {0}" +msgstr "是否覆蓋舊的備份檔案？" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231 +#, fuzzy, java-format +msgid "Error while creating backup of removed layer: {0}" +msgstr "建立快取目錄時發生錯誤：{0}" + +#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266 +#, java-format +msgid "Unable to read autosaved osm data ({0}) - {1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3535,5 +3571,5 @@ msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:240 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242 #, java-format msgid "" @@ -3541,5 +3577,5 @@ msgstr "無法將原型 {0} 加入資料組合，因為它已在其中" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:698 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700 #, java-format msgid "" @@ -3581,5 +3617,5 @@ #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:70 +#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3620,6 +3656,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 msgid "node" @@ -3630,5 +3665,4 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62 msgid "way" @@ -3639,7 +3673,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 msgid "relation" @@ -3856,7 +3889,7 @@ msgstr "不要再顯示（記住選擇）" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:300 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3864,29 +3897,29 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 msgid "incomplete" msgstr "不完整" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:354 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 msgid "highway" msgstr "公路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 #: build/trans_presets.java:3260 msgid "railway" msgstr "鐵路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 msgid "waterway" msgstr "航道" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358 msgid "landuse" msgstr "土地利用" @@ -3894,7 +3927,7 @@ #. note: length == 0 should no longer happen, but leave the bracket code #. nevertheless, who knows what future brings -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 @@ -3905,5 +3938,5 @@ msgstr[0] "{0} 節點" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:173 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174 msgid "public transport" msgstr "大眾運輸" @@ -3962,6 +3995,6 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 #: build/trans_style.java:4349 @@ -3969,6 +4002,6 @@ msgstr "建築" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:222 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:411 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412 #, java-format msgid "{0} member" @@ -3976,5 +4009,5 @@ msgstr[0] "{0} 成員" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:248 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -4049,5 +4082,5 @@ msgstr "物件已刪除" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 @@ -4146,69 +4179,69 @@ msgstr "密碼" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76 msgid "usage" msgstr "用法" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 msgid "options" msgstr "選項" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79 msgid "Show this help" msgstr "顯示此說明訊息" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80 msgid "Standard unix geometry argument" msgstr "標準 unix 幾何引數" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81 msgid "Download the bounding box" msgstr "下載此綁定方塊" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83 msgid "Open a file (any file type that can be opened with File/Open)" msgstr "開啟檔案（任何可以使用 檔案/開啟 來開啟的檔案類型）" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84 msgid "Download the bounding box as raw gps" msgstr "下載綁定方塊做為原始 gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps" msgstr "將 url (lat=x&lon=y&zoom=z) 的位置下載為原始 gps" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 msgid "Select with the given search" msgstr "選取指定的搜尋" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87 msgid "Launch in maximized mode" msgstr "以最大化模式啓動" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 msgid "Reset the preferences to default" msgstr "重設偏好設定為預設值" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89 msgid "Set the language" msgstr "設定語言" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90 msgid "options provided as Java system properties" msgstr "選項提供為 Java 系統屬性" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "/PATH/TO/JOSM/FOLDER/ " msgstr "/PATH/TO/JOSM/FOLDER/ " -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Change the folder for all user settings" msgstr "改變所有使用者設定值的資料夾" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 msgid "" "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add " @@ -4220,9 +4253,9 @@ " Java 選項以 MB 來指定分配到記憶體的最大容量" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95 msgid "examples" msgstr "範例" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 msgid "" "Parameters --download, --downloadgps, and --selection are processed in this " @@ -4230,46 +4263,62 @@ msgstr "參數 --download、 --downloadgps 和 --selection 會以這個順序處理。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103 msgid "Make sure you load some data if you use --selection." msgstr "如果您使用 --selection 請確定已載入某些資料。" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189 msgid "Initializing" msgstr "初始化" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195 msgid "Updating plugins..." msgstr "正在更新外掛程式..." -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200 msgid "Installing updated plugins" msgstr "正在安裝更新的外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204 msgid "Loading early plugins" msgstr "載入較早的外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208 msgid "Setting defaults" msgstr "設定預設值" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213 msgid "Creating main GUI" msgstr "建立主視窗中" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220 msgid "Loading plugins" msgstr "正在載入外掛程式" -#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262 +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246 +msgid "Unsaved osm data" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247 +#, fuzzy +msgid "Restore" +msgstr "解決" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249 +#, java-format +msgid "" +"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " +"time. Do you want to restore data?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284 #, java-format msgid "Preference setting {0} has been removed since it is no longer used." msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 msgid "File" msgstr "檔案" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 @@ -4288,10 +4337,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172 -#: build/specialmessages.java:68 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: build/specialmessages.java:76 msgid "View" msgstr "檢視" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26 @@ -4299,10 +4348,11 @@ msgstr "工具" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" msgstr "預設組合" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -4313,5 +4363,5 @@ msgstr "選單：{0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:316 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321 msgid "Audio" msgstr "音效" @@ -4587,5 +4637,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424 @@ -4603,5 +4653,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" @@ -4804,5 +4854,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 -#: build/specialmessages.java:64 +#: build/specialmessages.java:72 msgid "Up" msgstr "上" @@ -5016,6 +5066,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 msgid "Key" @@ -5030,6 +5080,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:466 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:488 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25 @@ -5090,17 +5140,17 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" msgstr "取消衝突調解" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" msgstr "接受已調解的衝突" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643 @@ -5171,20 +5221,22 @@ msgstr "衝突發生於貼上的標籤" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "Paste ..." msgstr "貼上 ..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "From ..." msgstr "從..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392 msgid "To ..." msgstr "到..." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 +#. minimum size is relevant for multisplit layout +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498 #, java-format msgid "{0} tag" @@ -5192,5 +5244,5 @@ msgstr[0] "{0} 標籤" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 @@ -5201,5 +5253,5 @@ msgstr[0] "{0} 路徑" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 @@ -5264,5 +5316,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148 -#: build/specialmessages.java:77 +#: build/specialmessages.java:85 msgid "Value:" msgstr "數值：" @@ -5377,5 +5429,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456 -#: build/specialmessages.java:28 +#: build/specialmessages.java:36 msgid "Details" msgstr "詳細資料" @@ -5781,5 +5833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393 msgid "Create a copy of this relation and open it in another editor window" msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它" @@ -5862,5 +5914,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 @@ -6063,5 +6115,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38 -#: build/specialmessages.java:51 +#: build/specialmessages.java:59 msgid "Open" msgstr "開啟" @@ -6913,5 +6965,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 -#: build/specialmessages.java:49 build/trans_presets.java:87 +#: build/specialmessages.java:57 build/trans_presets.java:87 #: build/trans_presets.java:123 build/trans_presets.java:163 #: build/trans_presets.java:200 build/trans_presets.java:220 @@ -7499,5 +7551,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134 msgid "" msgstr "<不同>" @@ -7626,5 +7678,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614 msgid "Conflict in data" @@ -7678,26 +7730,26 @@ msgstr "({0}/{1})：正在下載關係「{2}」..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 msgid "Tags and Members" msgstr "標籤與成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 msgid "Parent Relations" msgstr "上層關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 msgid "Child Relations" msgstr "子關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 msgid "Apply Role:" msgstr "套用角色：" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298 msgid "Enter a role and apply it to the selected relation members" msgstr "輸入一個角色並將它套用至選取的關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "" "There is at least one member in this relation referring
to the " @@ -7708,14 +7760,14 @@ "依關係，但是不建議這麼做。
您要如何處理循環相依關係？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 msgid "Remove them, clean up relation" msgstr "移除它們，清除關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 msgid "Ignore them, leave relation as is" msgstr "忽略它們，保持關係原貌" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622 #, java-format msgid "" @@ -7727,9 +7779,9 @@ "個關係成員嗎？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632 msgid "Multiple members referring to same primitive" msgstr "多個成員參照到同一原型" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 #, java-format msgid "" @@ -7741,15 +7793,15 @@ "做。
正略過關係「{0}」。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "將目前資料組合中選取的所有原型加到第一個成員之前" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "將目前資料組合中選取的所有原型加到最後一個成員之後" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7757,5 +7809,5 @@ msgstr "將目前資料組合中選取的所有原型加到第一個選取的成員之前" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7763,20 +7815,20 @@ msgstr "將目前資料組合中選取的所有原型加到最後一個選取的成員之後" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810 msgid "Remove all members referring to one of the selected primitives" msgstr "移除所有參照到選取原型其中之一的成員" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 msgid "Relation Editor: Remove Selected" msgstr "關係編輯器：移除已選取的" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "選取參照到目前選取範圍的關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857 #, java-format msgid "" @@ -7785,64 +7837,64 @@ msgstr "選取參照到目前選取範圍 {0} 原型的關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 msgid "Select primitives for selected relation members" msgstr "選擇已選取關係成員的原型" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 msgid "Sort the relation members" msgstr "排序關係成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Sort" msgstr "排序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 msgid "Relation Editor: Sort" msgstr "關係編輯器：排序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924 msgid "Reverse the order of the relation members" msgstr "反轉關係成員的順序" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Reverse" msgstr "反轉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 msgid "Relation Editor: Reverse" msgstr "關係編輯器：反轉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Move the currently selected members up" msgstr "將目前選取的成員上移" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Move Up" msgstr "關係編輯器：上移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Move the currently selected members down" msgstr "將目前選取的成員下移" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969 msgid "Relation Editor: Move Down" msgstr "關係編輯器：下移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 msgid "Remove the currently selected members from this relation" msgstr "將目前選取的成員從這個關係中移除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988 msgid "Relation Editor: Remove" msgstr "關係編輯器：移除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004 msgid "Delete the currently edited relation" msgstr "刪除目前編輯的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1031 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051 msgid "" "One or more members of this new relation have been deleted while the " @@ -7853,23 +7905,23 @@ "它們已經從關係成員清單移除了。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595 msgid "Yes, create a conflict and close" msgstr "是，建立衝突並關閉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 msgid "Click to create a conflict and close this relation editor" msgstr "點選以建立衝突項目並關閉這個關係編輯器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601 msgid "No, continue editing" msgstr "否，繼續編輯" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 msgid "Click to return to the relation editor and to resume relation editing" msgstr "點選以返回關係編輯器並繼續關係的編輯" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7880,5 +7932,5 @@ "續編輯。

是否要建立衝突並關閉編輯器？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136 #, java-format msgid "" @@ -7889,50 +7941,50 @@ "一次。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641 msgid "Apply the current updates" msgstr "套用目前的更新" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684 msgid "Apply the updates and close the dialog" msgstr "套用更新並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738 msgid "Cancel the updates and close the dialog" msgstr "取消更新並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Add an empty tag" msgstr "加入空的標籤" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248 msgid "Download all incomplete members" msgstr "下載所有未完成的成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Download Members" msgstr "下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284 msgid "Relation Editor: Download Members" msgstr "關係編輯器：下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281 msgid "Download selected incomplete members" msgstr "下載選取的未完成成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 msgid "Sets a role for the selected members" msgstr "為選取的成員設定角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 msgid "Apply Role" msgstr "套用角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7940,27 +7992,33 @@ msgstr[0] "您正在設定 {0} 個原型的空白角色。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337 msgid "This is equal to deleting the roles of these primitives." msgstr "這樣等同刪除這些原型的角色。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339 msgid "Do you really want to apply the new role?" msgstr "您確定要套用新的角色嗎？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341 msgid "Yes, apply it" msgstr "是，套用它" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342 msgid "No, do not apply" msgstr "否，不套用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348 msgid "Confirm empty role" msgstr "確認空白角色" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416 msgid "Edit the relation the currently selected relation member refers to" msgstr "編輯目前選取關係成員所參照的關係" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491 +msgid "" +"Members from paste buffer cannot be added because they are not included in " +"current layer" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -8298,5 +8356,5 @@ #. item "Land use/Forest" text "Name" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440 -#: build/specialmessages.java:63 build/trans_presets.java:411 +#: build/specialmessages.java:71 build/trans_presets.java:411 #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 @@ -9773,12 +9831,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220 msgid "Download from OSM along this track" msgstr "從 OSM 沿這條軌跡下載" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82 msgid "Download everything within:" msgstr "下載這裡面的每個物件：" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85 #, java-format msgid "{0} meters" @@ -9786,8 +9848,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92 msgid "Maximum area per request:" msgstr "每個要求最大區域：" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95 #, java-format msgid "{0} sq km" @@ -9811,4 +9875,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025 +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214 #, java-format msgid "" @@ -10240,10 +10305,10 @@ msgstr[0] "發現 {0} 已有 GPS 標籤。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "從磁碟刪除圖片檔" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #, java-format msgid "" @@ -10253,5 +10318,5 @@ "

是否從磁碟刪除檔案 {0}？

這個照片檔案會永久消失！

" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690 msgid "Image file could not be deleted." msgstr "無法刪除圖片檔案。" @@ -12496,5 +12561,5 @@ msgstr "加入新標籤" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361 #, java-format msgid "" @@ -12504,53 +12569,49 @@ "損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的相同" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:469 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313 msgid "More information about this feature" msgstr "更多關於這個功能的資訊" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:506 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525 #, java-format msgid "Unknown requisite: {0}" msgstr "不明的必需品：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582 msgid "Available roles" msgstr "可用的角色" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583 msgid "role" msgstr "角色" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584 msgid "count" msgstr "計次" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585 msgid "elements" msgstr "元素" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600 msgid "Optional Attributes:" msgstr "額外屬性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672 -msgid "closedway" -msgstr "封閉路徑" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698 #, java-format msgid "Unknown type: {0}" msgstr "不明的類型：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766 msgid "Preset role element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774 msgid "Preset sub element without parent" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -12560,15 +12621,15 @@ msgstr "無法讀取標籤預設組合來源：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817 #, java-format msgid "Error parsing {0}: " msgstr "分析 {0} 時發生錯誤： " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:837 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858 #, java-format msgid "Elements of type {0} are supported." msgstr "類型 {0} 的元件已支援。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:900 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921 #: ../plugins/terracer/src/terracer/TerracerAction.java:149 #, java-format @@ -12577,18 +12638,18 @@ msgstr[0] "改變 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924 msgid "Nothing selected!" msgstr "尚未選擇！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:905 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926 msgid "Selection unsuitable!" msgstr "選擇區域不合適！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:913 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934 msgid "Apply Preset" msgstr "套用預設組合" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:988 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" msgstr "改變屬性" @@ -12603,4 +12664,28 @@ msgid "Preset group {0}" msgstr "預設組合 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +#, fuzzy +msgid "Search preset" +msgstr "搜尋： " + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 +msgid "Show preset search dialog" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17 +#, fuzzy +msgid "Search presets" +msgstr "搜尋物件" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263 +#, fuzzy +msgid "Show only applicable to selection" +msgstr "在選擇清單中顯示本地化的名稱" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280 +#, fuzzy +msgid "Search in tags" +msgstr "搜尋： " #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71 @@ -13311,5 +13396,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76 -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:285 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 #, java-format msgid "(at line {0}, column {1})" @@ -13321,10 +13406,10 @@ msgstr "OSM 伺服器檔案" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89 #, java-format msgid "An error occurred while saving.
Error is:
{0}" msgstr "在儲存時發生錯誤。
錯誤為：
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104 #, java-format msgid "" @@ -13333,5 +13418,5 @@ msgstr "從備份檔案還原時發生錯誤。
錯誤為：
{0}" -#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114 +#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119 #, java-format msgid "Could not back up file. Exception is: {0}" @@ -14060,11 +14145,11 @@ msgstr "下載外掛程式清單..." -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:149 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:201 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211 #, java-format msgid "Downloading plugin list from ''{0}''" msgstr "正從「{0}」下載外掛程式清單" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269 #, java-format msgid "" @@ -14075,16 +14160,16 @@ "單。" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273 #, java-format msgid "Writing plugin list to local cache ''{0}''" msgstr "正在將外掛程式清單寫入本地端快取「{0}」" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:304 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314 #, java-format msgid "Parsing plugin list from site ''{0}''" msgstr "正在分析網站「{0}」的外掛程式清單" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:309 -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:312 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322 #, java-format msgid "" @@ -14093,5 +14178,5 @@ msgstr "無法解析網站「{0}」的外掛程式清單文件。正在略過網站。例外為：{1}" -#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:339 +#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350 #, java-format msgid "Processing plugin list from site ''{0}''" @@ -14402,5 +14487,5 @@ "

錯誤的訊息為：
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15186,14 +15271,14 @@ msgstr "建築物" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424 msgid "Next no" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "街" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466 msgid "Enter addresses" msgstr "" @@ -15230,5 +15315,5 @@ #. this below is a temporary workaround to fix the "always on top" issue #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:426 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439 msgid "Select Feuille" msgstr "" @@ -15287,5 +15372,5 @@ msgstr "CadastreGrabber: 不合法的 url。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83 msgid "" "Cannot open a new client session.\n" @@ -15295,5 +15380,5 @@ "伺服器正在維護或是暫時過載。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91 #, java-format msgid "" @@ -15304,5 +15389,5 @@ "或是動作已取消" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408 msgid "Choose from..." msgstr "選擇自..." @@ -15310,17 +15395,17 @@ #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:406 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419 msgid "Select commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188 msgid "Auto sourcing" msgstr "自動來源" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -15332,13 +15417,13 @@ "您是否想要回復以 F11 作為抓取動作？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257 msgid "Restore grab shortcut F11" msgstr "回復抓取捷徑鍵 F11" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262 msgid "JOSM is stopped for the change to take effect." msgstr "JOSM 已停止以便讓變更生效。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:365 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368 #, java-format msgid "" @@ -15363,13 +15448,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290 msgid "Disable image cropping during georeferencing." msgstr "在進行地理參照時停用圖片剪裁。" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 +msgid "Use \"Tableau d''assemblage\"" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 msgid "Select first WMS layer in list." msgstr "先在清單中選取一個 WMS 圖層。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -15425,5 +15514,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 #: build/trans_presets.java:2376 build/trans_style.java:1018 @@ -15434,13 +15523,13 @@ msgstr "水域" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "symbol" msgstr "符號" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "parcel number" msgstr "地號" @@ -15488,5 +15577,5 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 #: build/trans_style.java:4377 build/trans_style.java:4384 #: build/trans_style.java:4391 build/trans_style.java:4398 @@ -15494,26 +15583,26 @@ msgstr "住址" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "locality" msgstr "所在地" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." msgstr "啟用自動快取。" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" msgstr "最大快取容量 (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15525,18 +15614,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102 msgid "French cadastre WMS" msgstr "法國 cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "當自動來源啓用時設定鍵「source」的數值" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" msgstr "來源" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15544,5 +15633,5 @@ msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15550,127 +15639,132 @@ msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131 msgid "Allows multiple layers stacking" msgstr "允許多重圖層堆疊" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "設定 WMS 圖層透明度。右邊是不透明，左邊是透明。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "在從 WMS 伺服器下載的資料周圍繪出一個矩形。" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151 msgid "Image resolution:" msgstr "圖片解析度：" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "High resolution (1000x800)" msgstr "高解析度 (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Medium resolution (800x600)" msgstr "中解析度 (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165 msgid "Low resolution (600x400)" msgstr "低解析度 (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "最鄰近 (最快) [預設值]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184 msgid "Bilinear (fast)" msgstr "雙線性 (快速)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185 msgid "Bicubic (slow)" msgstr "雙立體 (慢速)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" msgstr "向量圖片抓取倍數：" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 msgid "Grab one image full screen" msgstr "抓取一張全螢幕圖片" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 msgid "Grab smaller images (higher quality but use more memory)" msgstr "抓取較小的圖片（較高的品質但消耗更多記憶體）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223 msgid "Fixed size square (default is 100m)" msgstr "固定大小矩形（預設為 100m）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243 msgid "Fixed size (from 25 to 1000 meters)" msgstr "固定大小（從 25 到 100 公尺）" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248 msgid "Layers:" msgstr "圖層：" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." msgstr "海、河流、游泳池。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." msgstr "建築、遮蔽物、地下建築物。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." msgstr "符號，像十字架之類。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." msgstr "地址、門牌號碼" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." msgstr "所在地、村莊、位置。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 msgid "Municipality administrative borders." msgstr "自治行政區邊界。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" msgstr "點陣圖片抓取倍數：" +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 +msgid "" +"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab." +msgstr "" + #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "當超過這個大小時較舊的檔案會自動刪除" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -15678,5 +15772,5 @@ msgstr "如果抓取時有多個圖層則自動選擇第一個 WMS 圖層。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16086,4 +16180,39 @@ msgid "TCX Files (*.tcx)" msgstr "TCX 檔案 (*.tcx)" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55 +#, fuzzy +msgid "Download along..." +msgstr "下載物件..." + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56 +#, fuzzy +msgid "Download OSM data along the selected ways." +msgstr "下載地圖資料於選取的路徑結尾" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58 +#, fuzzy +msgid "Download Along" +msgstr "立即下載" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74 +#, fuzzy +msgid "Please select 1 or more ways to download along" +msgstr "請選擇至少一項要下載的工作" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167 +#, java-format +msgid "{0} intermediate nodes to download." +msgstr "" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168 +#, fuzzy, java-format +msgid "between {0} {1} and {2} {3}" +msgstr "測試 {0}/{1}：正在開始 {2}" + +#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172 +#, fuzzy, java-format +msgid " adding {0} {1}" +msgstr "分析 {0} 時發生錯誤：{1}" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75 @@ -16173,5 +16302,5 @@ #. Plugin ext_tools #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27 -#: build/trans_plugins.java:24 +#: build/trans_plugins.java:26 msgid "Use external scripts in JOSM" msgstr "" @@ -16254,5 +16383,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134 -#: build/specialmessages.java:54 +#: build/specialmessages.java:62 msgid "Refresh" msgstr "重新整理" @@ -16801,30 +16930,31 @@ msgstr "測量" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52 msgid "Michigan Left" msgstr "密西根左轉" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50 msgid "Adds no left turn for sets of 4 or 5 ways." msgstr "為 4 或 5 條路徑加入禁止左轉。" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72 msgid "Please select 4 or 5 ways to assign no left turns." msgstr "請選擇 4 或 5 條要指派禁止左轉的路徑。" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89 msgid "Please select 4 ways that form a closed relation." msgstr "請從封閉的關係選擇 4 條路徑。" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113 msgid "Unable to order the ways. Please verify their directions" msgstr "無法排序路徑。請檢驗它們的方向" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120 -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201 msgid "Create Michigan left turn restriction" msgstr "建立密西根左轉彎限制" -#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154 +#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160 msgid "Unable to find via nodes. Please check your selection" msgstr "無法透過節點找到。請檢查您的選擇區域" @@ -16940,13 +17070,13 @@ msgstr "佇列" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "offline" msgstr "離線" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 msgid "online" msgstr "上線" -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417 #, java-format msgid "OpenStreetBugs ({0})" @@ -17452,9 +17582,4 @@ msgstr "缺少 id {1} {0} 的合併目標" -#: ../plugins/reverter/src/reverter/DataSetToCmd.java:51 -#, java-format -msgid "Target of type {0} with id {1} has invalid version" -msgstr "id {1} 類型 {0} 的目標有無效的版本" - #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 @@ -17499,5 +17624,5 @@ msgstr "還原變更組合 #{0}" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87 msgid "Road Sign Plugin" msgstr "" @@ -17525,10 +17650,10 @@ msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:107 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 #, java-format msgid "Sign {0}" msgstr "" -#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:114 +#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115 #, java-format msgid "Additional sign {0}" @@ -18732,47 +18857,47 @@ msgstr "改變為基本編輯器並選擇 OSM 路徑" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object..." msgstr "取消刪除物件..." -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64 msgid "Undelete object by id" msgstr "依 ID 取消刪除物件" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70 msgid "Select if the data should be added into a new layer" msgstr "如果資料要加入到新的圖層裡請選擇此項" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88 msgid "Enter the ID of the object that should be undeleted" msgstr "輸入要取消刪除的物件 ID" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100 msgid "Undelete Object" msgstr "取消刪除物件" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101 msgid "Undelete object" msgstr "取消刪除物件" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 msgid "Start undeleting" msgstr "開始取消刪除" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107 msgid "Close dialog and cancel" msgstr "關閉對話盒並取消" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162 #, java-format msgid "Will get {0}" msgstr "會得到 {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166 #, java-format msgid "Looking for {0}" msgstr "尋找 {0}" -#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176 +#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168 #, java-format msgid "Found {0}" @@ -19007,14 +19132,50 @@ msgstr "路徑交叉" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239 msgid "Duplicated nodes" msgstr "重複的節點" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90 msgid "This test checks that there are no nodes at the very same location." msgstr "這會測試有沒有位置非常相近的節點存在。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170 +#, fuzzy +msgid "Mixed type duplicated nodes" +msgstr "是否合併重複的節點？" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181 +#, fuzzy +msgid "Highway duplicated nodes" +msgstr "重複的節點" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192 +#, fuzzy +msgid "Railway duplicated nodes" +msgstr "重複的節點" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203 +#, fuzzy +msgid "Waterway duplicated nodes" +msgstr "是否合併重複的節點？" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214 +#, fuzzy +msgid "Boundary duplicated nodes" +msgstr "重複的節點" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225 +#, fuzzy +msgid "Power duplicated nodes" +msgstr "是否合併重複的節點？" + +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262 msgid "Nodes at same position" msgstr "節點在同一個地點" @@ -19169,59 +19330,59 @@ msgstr "重疊的路徑" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:44 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41 msgid "Relation checker :" msgstr "關係檢查程式：" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42 msgid "This plugin checks for errors in relations." msgstr "這個外掛程式會檢查在關係中的錯誤。" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112 msgid "Relation type is unknown" msgstr "關係類型不明" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:145 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142 msgid "Relation is empty" msgstr "關係是空白的" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:155 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152 msgid "" msgstr "<空白>" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:163 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160 #, java-format msgid "Role {0} missing" msgstr "缺少角色 {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:164 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:170 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:176 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:184 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:195 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:201 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198 msgid "Role verification problem" msgstr "角色驗證問題" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:169 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166 #, java-format msgid "Number of {0} roles too low ({1})" msgstr "{0} 角色的編號太低 ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:175 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172 #, java-format msgid "Number of {0} roles too high ({1})" msgstr "{0} 角色的編號太高 ({1})" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:183 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180 #, java-format msgid "Member for role {0} of wrong type" msgstr "角色 {0} 成員的類型錯誤" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:194 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191 #, java-format msgid "Role {0} unknown" msgstr "不明的角色 {0}" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:200 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197 msgid "Empty role found" msgstr "發現空白角色" @@ -20092,55 +20253,55 @@ msgstr "無效的 URL？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Download visible tiles" msgstr "下載可見的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:317 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "要求的區域太大。請拉近一點，或是改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330 msgid "Change resolution" msgstr "改變解析度" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:341 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342 msgid "Reload erroneous tiles" msgstr "重新載入錯誤的拼貼" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:365 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366 msgid "Alpha channel" msgstr "透明色版" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386 msgid "Save WMS layer to file" msgstr "將 WMS 圖層儲存為檔案" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390 msgid "Save WMS layer" msgstr "儲存 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414 msgid "Load WMS layer from file" msgstr "從檔案載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418 msgid "Load WMS layer" msgstr "載入 WMS 圖層" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:428 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430 msgid "File Format Error" msgstr "檔案格式錯誤" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:449 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450 msgid "Error loading file" msgstr "載入檔案有錯誤" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:463 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464 msgid "Set WMS Bookmark" msgstr "設定 WMS 書籤" @@ -20283,231 +20444,127 @@ #. relation type -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. color boundary -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color boundary -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:17 build/trans_style.java:3655 -#: build/trans_style.java:3663 build/trans_style.java:3667 -#: build/trans_style.java:3671 build/trans_style.java:3675 -#: build/trans_style.java:3679 build/trans_style.java:3683 -#: build/trans_style.java:3687 build/trans_style.java:3691 -#: build/trans_style.java:3695 build/trans_style.java:3699 -#: build/trans_style.java:3704 build/trans_style.java:3712 -#: build/trans_style.java:3720 build/trans_style.java:3728 +#: build/specialmessages.java:17 +#, fuzzy +msgctxt "Relation type" +msgid "associatedStreet" +msgstr "建立 associatedStreet 關係" + +#. relation type +#: build/specialmessages.java:18 +#, fuzzy +msgctxt "Relation type" msgid "boundary" msgstr "邊界" #. relation type -#: build/specialmessages.java:18 +#: build/specialmessages.java:19 +#, fuzzy +msgctxt "Relation type" +msgid "enforcement" +msgstr "遞增" + +#. relation type +#: build/specialmessages.java:20 +#, fuzzy +msgctxt "Relation type" +msgid "line" +msgstr "上線" + +#. relation type +#: build/specialmessages.java:21 +#, fuzzy +msgctxt "Relation type" msgid "multipolygon" msgstr "多重多邊形" #. relation type -#. color natural -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color route -#. -#. 1 -#. 50000 -#. -#. -#. -#. -#: build/specialmessages.java:19 build/trans_style.java:3589 -#: build/trans_style.java:3597 build/trans_style.java:3605 -#: build/trans_style.java:3613 build/trans_style.java:3621 -#: build/trans_style.java:3629 build/trans_style.java:3637 -#: build/trans_style.java:3645 +#: build/specialmessages.java:22 +#, fuzzy +msgctxt "Relation type" +msgid "network" +msgstr "網路" + +#. relation type +#: build/specialmessages.java:23 +#, fuzzy +msgctxt "Relation type" +msgid "public_transport" +msgstr "大眾運輸" + +#. relation type +#: build/specialmessages.java:24 +#, fuzzy +msgctxt "Relation type" +msgid "restriction" +msgstr "Turnrestriction" + +#. relation type +#: build/specialmessages.java:25 +#, fuzzy +msgctxt "Relation type" msgid "route" msgstr "路線" +#. relation type +#: build/specialmessages.java:26 +#, fuzzy +msgctxt "Relation type" +msgid "site" +msgstr "貼上" + +#. relation type +#: build/specialmessages.java:27 +#, fuzzy +msgctxt "Relation type" +msgid "waterway" +msgstr "航道" + #. Strings in JFileChooser -#: build/specialmessages.java:21 +#: build/specialmessages.java:29 msgid "All Files" msgstr "所有檔案" #. Strings in JFileChooser -#: build/specialmessages.java:22 +#: build/specialmessages.java:30 msgid "Attributes" msgstr "屬性" #. Strings in JFileChooser -#: build/specialmessages.java:23 +#: build/specialmessages.java:31 msgid "Abort file chooser dialog" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:24 +#: build/specialmessages.java:32 msgid "Abort file chooser dialog." msgstr "中止檔案選擇對話盒。" #. Strings in JFileChooser -#: build/specialmessages.java:26 +#: build/specialmessages.java:34 msgid "Create New Folder" msgstr "建立新的資料夾" #. Strings in JFileChooser -#: build/specialmessages.java:27 +#: build/specialmessages.java:35 msgid "Delete File" msgstr "刪除檔案" #. Strings in JFileChooser -#: build/specialmessages.java:29 +#: build/specialmessages.java:37 msgid "Enter file name:" msgstr "請輸入檔案名稱：" #. Strings in JFileChooser -#: build/specialmessages.java:30 +#: build/specialmessages.java:38 msgid "Enter path or folder name:" msgstr "輸入路徑或資料夾名稱：" #. Strings in JFileChooser -#: build/specialmessages.java:31 +#: build/specialmessages.java:39 msgid "Error " msgstr "錯誤 " #. Strings in JFileChooser -#: build/specialmessages.java:32 +#: build/specialmessages.java:40 #, java-format msgid "Error renaming file \"{0}\" to \"{1}\"" @@ -20515,90 +20572,90 @@ #. Strings in JFileChooser -#: build/specialmessages.java:33 +#: build/specialmessages.java:41 msgid "File name:" msgstr "檔案名稱：" #. Strings in JFileChooser -#: build/specialmessages.java:34 +#: build/specialmessages.java:42 msgid "File Name:" msgstr "檔案名稱：" #. Strings in JFileChooser -#: build/specialmessages.java:35 +#: build/specialmessages.java:43 msgid "FileChooser help." msgstr "FileChooser 求助。" #. Strings in JFileChooser -#: build/specialmessages.java:36 +#: build/specialmessages.java:44 msgid "Files" msgstr "檔案" #. Strings in JFileChooser -#: build/specialmessages.java:37 +#: build/specialmessages.java:45 msgid "Files of type:" msgstr "檔案類型：" #. Strings in JFileChooser -#: build/specialmessages.java:38 +#: build/specialmessages.java:46 msgid "Files of Type:" msgstr "檔案類型：" #. Strings in JFileChooser -#: build/specialmessages.java:40 +#: build/specialmessages.java:48 msgid "Filter:" msgstr "過濾條件：" #. Strings in JFileChooser -#: build/specialmessages.java:41 +#: build/specialmessages.java:49 msgid "Folders" msgstr "資料夾" #. Strings in JFileChooser -#: build/specialmessages.java:43 +#: build/specialmessages.java:51 msgid "Home" msgstr "家目錄" #. Strings in JFileChooser -#: build/specialmessages.java:44 +#: build/specialmessages.java:52 msgid "List" msgstr "清單" #. Strings in JFileChooser -#: build/specialmessages.java:45 +#: build/specialmessages.java:53 msgid "Look in:" msgstr "尋找於：" #. Strings in JFileChooser -#: build/specialmessages.java:46 +#: build/specialmessages.java:54 msgid "Look In:" msgstr "尋找於：" #. Strings in JFileChooser -#: build/specialmessages.java:47 +#: build/specialmessages.java:55 msgid "Modified" msgstr "已修改" #. Strings in JFileChooser -#: build/specialmessages.java:48 +#: build/specialmessages.java:56 msgid "New Folder" msgstr "新增資料夾" #. Strings in JFileChooser -#: build/specialmessages.java:52 +#: build/specialmessages.java:60 msgid "Open selected file" msgstr "" #. Strings in JFileChooser -#: build/specialmessages.java:53 +#: build/specialmessages.java:61 msgid "Open selected file." msgstr "開啟選取的檔案。" #. Strings in JFileChooser -#: build/specialmessages.java:55 +#: build/specialmessages.java:63 msgid "Rename File" msgstr "更改檔案名稱" #. Strings in JFileChooser -#: build/specialmessages.java:56 +#: build/specialmessages.java:64 #, java-format msgid "Rename file \"{0}\" to" @@ -20606,75 +20663,75 @@ #. Strings in JFileChooser -#: build/specialmessages.java:58 +#: build/specialmessages.java:66 msgid "Save in:" msgstr "儲存於：" #. Strings in JFileChooser -#: build/specialmessages.java:59 +#: build/specialmessages.java:67 msgid "Save In:" msgstr "儲存於：" #. Strings in JFileChooser -#: build/specialmessages.java:60 +#: build/specialmessages.java:68 msgid "Save selected file." msgstr "儲存選取的檔案。" #. Strings in JFileChooser -#: build/specialmessages.java:61 +#: build/specialmessages.java:69 msgid "Selection:" msgstr "選擇區域：" #. Strings in JFileChooser -#: build/specialmessages.java:62 +#: build/specialmessages.java:70 msgid "Size" msgstr "容量" #. Strings in JFileChooser -#: build/specialmessages.java:65 +#: build/specialmessages.java:73 msgid "Up One Level" msgstr "往上一層" #. Strings in JFileChooser -#: build/specialmessages.java:66 +#: build/specialmessages.java:74 msgid "Update" msgstr "更新" #. Strings in JFileChooser -#: build/specialmessages.java:67 +#: build/specialmessages.java:75 msgid "Update directory listing." msgstr "更新目錄清單。" #. Strings in GTK ColorChooser -#: build/specialmessages.java:70 +#: build/specialmessages.java:78 msgid "Blue:" msgstr "藍：" #. Strings in GTK ColorChooser -#: build/specialmessages.java:71 +#: build/specialmessages.java:79 msgid "Color Name:" msgstr "顏色名稱：" #. Strings in GTK ColorChooser -#: build/specialmessages.java:72 +#: build/specialmessages.java:80 msgid "Green:" msgstr "綠：" #. Strings in GTK ColorChooser -#: build/specialmessages.java:73 +#: build/specialmessages.java:81 msgid "Hue:" msgstr "色相：" #. Strings in GTK ColorChooser -#: build/specialmessages.java:74 +#: build/specialmessages.java:82 msgid "GTK Color Chooser" msgstr "GTK 顏色選擇器" #. Strings in GTK ColorChooser -#: build/specialmessages.java:75 +#: build/specialmessages.java:83 msgid "Red:" msgstr "紅：" #. Strings in GTK ColorChooser -#: build/specialmessages.java:76 +#: build/specialmessages.java:84 msgid "Saturation:" msgstr "彩度：" @@ -20736,11 +20793,17 @@ "org。" +#. Plugin download_along +#: build/trans_plugins.java:20 +#, fuzzy +msgid "Downloads OSM data along a way" +msgstr "從 OSM 沿這條軌跡下載" + #. Plugin Duplicate-Way -#: build/trans_plugins.java:20 +#: build/trans_plugins.java:22 msgid "Duplicate Ways with an offset" msgstr "重製路徑並位移" #. Plugin editgpx -#: build/trans_plugins.java:22 +#: build/trans_plugins.java:24 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -20749,20 +20812,20 @@ #. Plugin globalsat -#: build/trans_plugins.java:26 +#: build/trans_plugins.java:28 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." msgstr "在 JOSM 中直接從 Globalsat dg100 資料記錄器下載 GPS 點。" #. Plugin graphview -#: build/trans_plugins.java:28 +#: build/trans_plugins.java:30 msgid "Visualizes routing information as a routing graph." msgstr "以路線圖顯示視覺化路線資訊" #. Plugin grid -#: build/trans_plugins.java:30 +#: build/trans_plugins.java:32 msgid "Provide a background layer that displays a map grid" msgstr "提供顯示地圖格線的背景圖層" #. Plugin ImageWayPoint -#: build/trans_plugins.java:32 +#: build/trans_plugins.java:34 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -20774,10 +20837,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:34 +#: build/trans_plugins.java:36 msgid "Helps vectorizing WMS images." msgstr "協助將 WMS 圖片向量化。" #. Plugin livegps -#: build/trans_plugins.java:36 +#: build/trans_plugins.java:38 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -20785,5 +20848,5 @@ #. Plugin measurement -#: build/trans_plugins.java:38 +#: build/trans_plugins.java:40 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -20795,15 +20858,15 @@ #. Plugin michigan_left -#: build/trans_plugins.java:40 +#: build/trans_plugins.java:42 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly-convert -#: build/trans_plugins.java:42 +#: build/trans_plugins.java:44 msgid "Simply convert an area to a multipolygon." msgstr "只把區域轉換為多重多邊形。" #. Plugin multipoly -#: build/trans_plugins.java:44 +#: build/trans_plugins.java:46 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -20812,5 +20875,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:46 +#: build/trans_plugins.java:48 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -20822,15 +20885,15 @@ #. Plugin openlayers -#: build/trans_plugins.java:48 +#: build/trans_plugins.java:50 msgid "Displays an OpenLayers background image" msgstr "顯示 OpenLayers 背景圖片" #. Plugin openstreetbugs -#: build/trans_plugins.java:50 +#: build/trans_plugins.java:52 msgid "Imports issues from OpenStreetBugs" msgstr "匯入OpenStreetBugs 的議題" #. Plugin openvisible -#: build/trans_plugins.java:52 +#: build/trans_plugins.java:54 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -20838,5 +20901,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:54 +#: build/trans_plugins.java:56 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -20844,5 +20907,5 @@ #. Plugin photo_geotagging -#: build/trans_plugins.java:56 +#: build/trans_plugins.java:58 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -20852,5 +20915,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:58 +#: build/trans_plugins.java:60 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -20859,10 +20922,10 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:60 +#: build/trans_plugins.java:62 msgid "The great JGoodies Plastic Look and Feel." msgstr "超棒的 JGoodies 塑膠外觀與感覺。" #. Plugin public_transport -#: build/trans_plugins.java:62 +#: build/trans_plugins.java:64 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -20870,15 +20933,15 @@ #. Plugin remotecontrol -#: build/trans_plugins.java:64 +#: build/trans_plugins.java:66 msgid "Let other applications send commands to JOSM." msgstr "讓其他的應用程式傳送指令給 JOSM。" #. Plugin reverter -#: build/trans_plugins.java:66 +#: build/trans_plugins.java:68 msgid "Plugin for reverting changesets" msgstr "還原變更組合的外掛程式" #. Plugin RoadSigns -#: build/trans_plugins.java:68 +#: build/trans_plugins.java:70 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -20888,5 +20951,5 @@ #. Plugin routes -#: build/trans_plugins.java:70 +#: build/trans_plugins.java:72 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20897,10 +20960,10 @@ #. Plugin routing -#: build/trans_plugins.java:72 +#: build/trans_plugins.java:74 msgid "Provides routing capabilities." msgstr "提供路線規畫的功能。" #. Plugin SimplifyArea -#: build/trans_plugins.java:74 +#: build/trans_plugins.java:76 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20909,5 +20972,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:76 +#: build/trans_plugins.java:78 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20917,15 +20980,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:78 +#: build/trans_plugins.java:80 msgid "Allow adding markers/nodes on current gps positions." msgstr "允許在目前的 gps 位置加入標記/節點。" #. Plugin tageditor -#: build/trans_plugins.java:80 +#: build/trans_plugins.java:82 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "提供在表格線中編輯標籤的對話盒。" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:82 +#: build/trans_plugins.java:84 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20937,10 +21000,10 @@ #. Plugin terracer -#: build/trans_plugins.java:84 +#: build/trans_plugins.java:86 msgid "Make terraced houses out of single blocks." msgstr "讓連棟房屋能超出單一區塊。" #. Plugin touchscreenhelper -#: build/trans_plugins.java:86 +#: build/trans_plugins.java:88 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20949,5 +21012,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:88 +#: build/trans_plugins.java:90 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20956,5 +21019,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:90 +#: build/trans_plugins.java:92 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20965,10 +21028,10 @@ #. Plugin undelete -#: build/trans_plugins.java:92 +#: build/trans_plugins.java:94 msgid "Allows undeleting object from OSM database" msgstr "允許從 OSM 資料庫中取消物件的刪除" #. Plugin validator -#: build/trans_plugins.java:94 +#: build/trans_plugins.java:96 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20979,5 +21042,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:96 +#: build/trans_plugins.java:98 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20989,5 +21052,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:98 +#: build/trans_plugins.java:100 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20998,15 +21061,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:100 +#: build/trans_plugins.java:102 msgid "Easy downloading along a long set of interconnected ways" msgstr "方便的下載一整組互相聯結的路徑" #. Plugin wayselector -#: build/trans_plugins.java:102 +#: build/trans_plugins.java:104 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:104 +#: build/trans_plugins.java:106 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21015,5 +21078,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:106 +#: build/trans_plugins.java:108 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21663,5 +21726,5 @@ #: build/trans_presets.java:1254 msgid "asphalt" -msgstr "" +msgstr "柏油" #: build/trans_presets.java:264 build/trans_presets.java:282 @@ -27608,10 +27671,14 @@ #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "line" -msgstr "" +msgstr "上線" #: build/trans_presets.java:2452 +#, fuzzy +msgctxt "Power Line" msgid "minor_line" -msgstr "" +msgstr "上線" #. item "Man Made/Power Line" combo "Voltage" @@ -28473,5 +28540,5 @@ #: build/trans_presets.java:2821 msgid "Emergency Access Point" -msgstr "" +msgstr "緊急連絡點" #. item "Health/Emergency Access Point" @@ -28480,5 +28547,5 @@ #: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" -msgstr "" +msgstr "編輯緊急連絡點" #. item "Health/Emergency Access Point" label "Edit Emergency Access Point" @@ -30310,5 +30377,5 @@ #: build/trans_style.java:914 msgid "emergency_access_point" -msgstr "" +msgstr "緊急連絡點" #. color water @@ -32973,4 +33040,177 @@ msgstr "海灘" +#. color natural +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3589 build/trans_style.java:3597 +#: build/trans_style.java:3605 build/trans_style.java:3613 +#: build/trans_style.java:3621 build/trans_style.java:3629 +#: build/trans_style.java:3637 build/trans_style.java:3645 +msgid "route" +msgstr "路線" + +#. color route +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. color boundary +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color boundary +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#: build/trans_style.java:3655 build/trans_style.java:3663 +#: build/trans_style.java:3667 build/trans_style.java:3671 +#: build/trans_style.java:3675 build/trans_style.java:3679 +#: build/trans_style.java:3683 build/trans_style.java:3687 +#: build/trans_style.java:3691 build/trans_style.java:3695 +#: build/trans_style.java:3699 build/trans_style.java:3704 +#: build/trans_style.java:3712 build/trans_style.java:3720 +#: build/trans_style.java:3728 +msgid "boundary" +msgstr "邊界" + #. color deprecated #. @@ -33489,4 +33729,10 @@ msgstr "" +#~ msgid "closedway" +#~ msgstr "封閉路徑" + +#~ msgid "Target of type {0} with id {1} has invalid version" +#~ msgstr "id {1} 類型 {0} 的目標有無效的版本" + #~ msgid "Open in Browser" #~ msgstr "在瀏覽器中打開" @@ -33517,7 +33763,4 @@ #~ msgid "All the ways were empty" #~ msgstr "所有的路徑都是空的" - -#~ msgid "Please select at least one task to download" -#~ msgstr "請選擇至少一項要下載的工作" #~ msgid "Can only edit help pages from JOSM Online Help"