Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 25650) +++ /applications/editors/josm/i18n/po/ar.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2010-12-30 18:13+0000\n" "Last-Translator: Hsn \n" @@ -17,15 +17,15 @@ "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: 2011-03-06 15:27+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:21+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -35,12 +35,12 @@ msgstr "المساعدة" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "تجاهل URL ملف غيرصحيح التكوين: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -76,7 +76,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -109,14 +109,14 @@ msgstr "التحذير" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "تجاهل URL سيئة التكوين: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -126,13 +126,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/Main.java:759 +msgid "Exit JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:760 +msgid "Continue, try anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:761 -msgid "Exit JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:762 -msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -153,4 +153,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -192,18 +193,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -222,4 +223,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "معلومات حول" @@ -309,5 +312,5 @@ msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" @@ -405,4 +408,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -485,5 +489,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -572,6 +576,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -614,51 +618,51 @@ msgstr "الرجاء إختيار على الأقل ثلاثة عقد." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "المعطيات" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "الطبقة" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "الخيار" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "التناقض" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "نزّل" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "السابق" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "التالي" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "لا يوجد شيء محدد للتكبير/للتصغير." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "زوم الى {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "كبّر/صغّر الرؤية إلى {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -668,5 +672,5 @@ msgstr "أعرض: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "لا تناقضات للتكبير عليها" @@ -964,9 +968,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "غير مفعّل : لا تطبق هذه المواصفة على الأغراض المختارة" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -975,5 +980,5 @@ msgstr "نسخة مطابقة" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "" @@ -1081,5 +1086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1432,6 +1437,7 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" -msgstr "" +#, fuzzy +msgid "Merge the currently selected objects into another layer" +msgstr "أدمج الطبقة الحالية في طبقة أخرى" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1694,7 +1700,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1717,9 +1723,13 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "غيّر غرض {0}" +msgstr[1] "غيّر {0} غرضين" +msgstr[2] "غيّر {0} أغراض" +msgstr[3] "غيّر {0} غرض" +msgstr[4] "غيّر {0} أغراض" +msgstr[5] "غيّر {0} غرض" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1832,4 +1842,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2737,5 +2748,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2743,4 +2754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3329,5 +3341,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3342,5 +3354,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3545,9 +3557,13 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "غيّر غرض {0}" +msgstr[1] "غيّر {0} غرضين" +msgstr[2] "غيّر {0} أغراض" +msgstr[3] "غيّر {0} غرض" +msgstr[4] "غيّر {0} أغراض" +msgstr[5] "غيّر {0} غرض" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3843,5 +3859,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3899,8 +3915,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4066,5 +4083,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "الخلفية" @@ -4760,5 +4777,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4772,4 +4789,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5265,6 +5283,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5386,5 +5404,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5623,5 +5641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5629,10 +5647,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "العرض" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5640,5 +5658,5 @@ msgstr "العدة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5646,5 +5664,5 @@ msgstr "التعيينات المسبقة" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5655,5 +5673,5 @@ msgstr "اللائحة: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "سمعيّ" @@ -6041,10 +6059,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +msgid "Merging deleted objects failed" msgstr "" @@ -6299,8 +6317,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "" @@ -6340,5 +6360,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6572,6 +6591,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6586,5 +6605,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6769,5 +6788,4 @@ msgstr "إفتح لائحة بكل الأوامر (مصد الإبطال)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6778,5 +6796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6784,7 +6802,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6815,13 +6834,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "حلّ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7394,11 +7413,11 @@ msgstr "أنقر لتكبير/تصغير محتويات اللوحة" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "المؤلفين" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "إفتح لائحة بإسم الأشخاص اللذين يعملون على الأغراض المختارة." @@ -7412,5 +7431,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7478,4 +7497,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "" @@ -7697,6 +7717,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "غير مفعّل : لا تطبق هذه المواصفة على الأغراض المختارة" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7732,5 +7753,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +msgid "Zoom to the corresponding objects in the current data layer" msgstr "" @@ -8864,5 +8885,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9334,5 +9355,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9386,5 +9407,5 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9474,10 +9495,10 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9491,16 +9512,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +msgid "Add all objects selected in the current dataset before the first member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +msgid "Add all objects selected in the current dataset after the last member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9508,11 +9527,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 msgid "" -"Add all primitives selected in the current dataset after the last selected " +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "إفتح لائحة بإسم الأشخاص اللذين يعملون على الأغراض المختارة." #. putValue(NAME, tr("Remove Selected")); @@ -9523,6 +9543,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9530,11 +9549,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "أمحي العلاقة المحددة" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9626,8 +9645,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9679,11 +9699,15 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -9959,5 +9983,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -9970,5 +9994,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10052,4 +10076,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10134,5 +10159,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10140,11 +10166,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10155,5 +10181,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10162,19 +10188,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10184,33 +10210,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10322,4 +10348,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "الغرض" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10432,5 +10462,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "" @@ -11063,13 +11093,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "جاري تحضير المعطيات..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11200,13 +11232,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11215,5 +11238,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11406,4 +11429,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11485,5 +11509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11695,23 +11719,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "طبقة المعطيات {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "خارج عن المنطقة المنزلة" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11720,11 +11744,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11733,32 +11757,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12482,6 +12506,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12505,7 +12529,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12520,5 +12544,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13413,4 +13437,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "" @@ -13527,15 +13552,13 @@ msgstr "رسم سريع ( أقل جودة)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "فقط على رأس الطريق." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13683,34 +13706,39 @@ msgstr "نقاط جهاز تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13718,5 +13746,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "المعطيات أو.أس.أم" @@ -14963,4 +14991,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "" @@ -15596,5 +15625,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15648,9 +15677,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15659,21 +15688,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15681,69 +15710,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17276,5 +17305,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19173,5 +19202,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19423,4 +19452,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20108,5 +20138,5 @@ msgstr "" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20210,4 +20240,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20398,22 +20432,22 @@ msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21046,4 +21080,14 @@ #: build/trans_presets.java:691 msgid "Waypoints" +msgstr "" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "محرّر العلاقات: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" msgstr "" @@ -22182,4 +22226,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22369,11 +22469,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -23908,6 +24001,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -23917,15 +24015,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -23933,5 +24031,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -23939,10 +24037,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -23951,5 +24049,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -23958,15 +24056,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -23974,20 +24072,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -23997,5 +24095,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24004,15 +24102,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24022,20 +24120,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24045,15 +24143,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24062,5 +24160,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24069,10 +24167,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24081,15 +24185,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24099,5 +24203,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24106,20 +24210,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39541,9 +39645,325 @@ msgstr "إختبار" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "إسم شارع مختصر" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "طريق عام بدون مرجع" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "نوع طريق عام مؤقت" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "خطء إملائي في إسم المفتاح" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "حاجز مستعمل على طريق" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "السرعة الأقصى المستعملة لطريق قدم" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "إسم شارع يحتوي على ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "علاقة بدون نوع" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "مطعم بدون إسم" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "شوارع NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "خرائط NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Unknown version" #~ msgstr "نسخة مجهولة" - -#~ msgid "Preparing data..." -#~ msgstr "جاري تحضير المعطيات..." #~ msgid "Incorrect password or username." @@ -39802,7 +40222,4 @@ #~ msgstr "أضف الإختيار" -#~ msgid "Object" -#~ msgstr "الغرض" - #~ msgid "Cannot connect to server." #~ msgstr "غير قادر على الإتصال بلمخدم." @@ -39981,7 +40398,4 @@ #~ msgid "Move Up" #~ msgstr "حرّك إلى الأعلى" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "محرّر العلاقات: {0}" #~ msgid "Cannot read time \"{0}\" from point {1} x {2}" @@ -40180,36 +40594,6 @@ #~ msgstr "أخطاء عند التنزيل" -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "شوارع NRW Geofabrik.de" - #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "NPE Maps" -#~ msgstr "خرائط NPE" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "abbreviated street name" -#~ msgstr "إسم شارع مختصر" - -#~ msgid "relation without type" -#~ msgstr "علاقة بدون نوع" - -#~ msgid "restaurant without name" -#~ msgstr "مطعم بدون إسم" - -#~ msgid "misspelled key name" -#~ msgstr "خطء إملائي في إسم المفتاح" - -#~ msgid "barrier used on a way" -#~ msgstr "حاجز مستعمل على طريق" - -#~ msgid "street name contains ss" -#~ msgstr "إسم شارع يحتوي على ss" - -#~ msgid "maxspeed used for footway" -#~ msgstr "السرعة الأقصى المستعملة لطريق قدم" #~ msgid "Toggle Full Screen view" @@ -40262,10 +40646,4 @@ #~ msgstr "إفتح طبقة أولاً ( جي بي إكس، أو أس أم ، خابية)" -#~ msgid "temporary highway type" -#~ msgstr "نوع طريق عام مؤقت" - -#~ msgid "highway without a reference" -#~ msgstr "طريق عام بدون مرجع" - #~ msgid "Amenities" #~ msgstr "خدمات/نافعات" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 25650) +++ /applications/editors/josm/i18n/po/bg.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-02-20 14:14+0000\n" "Last-Translator: pl71 \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:27+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:20+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Помощ" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Игнориране неправилен адрес на файл: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,15 +108,15 @@ msgstr "Внимание" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Параметърът \"downloadgps\" не възприема имена на файлове или файлови URL." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Игнориране на неправилна препратка: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -129,13 +129,13 @@ "(съвместима с Java 5) версия на JOSM.За повече информация:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Изход от програмата" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Продължи все пак" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -156,4 +156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -195,18 +196,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -225,4 +226,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "За програмата" @@ -309,8 +312,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: неочакван формат на адреса на API. Пренасочването към " @@ -413,4 +416,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -495,5 +499,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -582,6 +586,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -624,51 +628,51 @@ msgstr "Изберете не по-малко от три точки." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "данни" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "слой" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "избор" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "конфликт" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "свалено" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "предишен" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "следващ" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Няма нищо избрано за показване." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Показване на {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Промяна на мащаба за да може да се види {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -678,5 +682,5 @@ msgstr "Изглед: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Няма конфликти за показване." @@ -979,9 +983,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Изтегляне на примитиви отнасящи се до един от избраните примитиви." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -990,5 +995,5 @@ msgstr "Дублиране" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "" @@ -1097,5 +1102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1455,5 +1460,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Обединява текущо избраните примитиви в друг слой" @@ -1720,7 +1726,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1743,9 +1749,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "за {0} примитив" -msgstr[1] "за {0} примитива" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Изтриване на {0} обект" +msgstr[1] "Изтриване на {0} обекта" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1858,4 +1864,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2792,5 +2799,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2798,4 +2805,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3399,7 +3407,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3413,9 +3421,11 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." -msgstr "" +"object ''{1}''." +msgstr "" +"Внимание: слоя ''{0}'' вече не съществува. Не може да се разреши конфликт за " +"примитив ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67 @@ -3627,9 +3637,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Изтриване на {0} обект" +msgstr[1] "Изтриване на {0} обекта" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3935,5 +3945,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3991,8 +4001,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4146,5 +4157,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "фон" @@ -4853,5 +4864,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4865,4 +4876,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5366,6 +5378,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5483,5 +5495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Изображения" @@ -5726,5 +5738,5 @@ msgstr "Настройката {0} беше премахната тъй като вече не се използва." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5732,10 +5744,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Преглед" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5743,5 +5755,5 @@ msgstr "Инструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5749,5 +5761,5 @@ msgstr "Шаблони" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5758,5 +5770,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Аудио" @@ -6145,10 +6157,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +msgid "Merging deleted objects failed" msgstr "" @@ -6406,8 +6418,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(никой)" @@ -6447,5 +6461,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Примитив" @@ -6679,6 +6692,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6689,5 +6702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6872,5 +6885,4 @@ msgstr "Отвори списък на всички промени (буфер за връщане)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6881,5 +6893,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6887,7 +6899,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6918,13 +6931,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Отваряне диалог за сливане на избраните обекти от горния списък." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7499,11 +7512,11 @@ msgstr "Намаляване/увеличаване на панела" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Автори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Покажи списък хора, работещи по избраните обекти." @@ -7517,5 +7530,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7585,4 +7598,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Поправяне" @@ -7804,6 +7818,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "Показване историята на избраните елементи." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7839,6 +7854,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "Не е намерен примитив с id = {0} в тази база данни" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 @@ -8971,5 +8987,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9441,5 +9457,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9493,8 +9509,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Подчинената релация
{0}
е изтрита на сървъра. Не може да бъде " -"заредена." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9583,10 +9597,10 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9600,28 +9614,30 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "качване на всички промени в текущия слой данни към сървър на OSM." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "качване на всички промени в текущия слой данни към сървър на OSM." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" -msgstr "" +msgstr "качване на всички промени в текущия слой данни към сървър на OSM." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Изтегляне на примитиви отнасящи се до един от избраните примитиви." #. putValue(NAME, tr("Remove Selected")); @@ -9632,6 +9648,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9639,11 +9654,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Установява роля за избраните членове" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9735,8 +9750,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9788,11 +9804,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -10072,5 +10088,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -10083,5 +10099,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10165,4 +10181,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10247,5 +10264,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10253,11 +10271,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10268,5 +10286,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10275,19 +10293,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10297,33 +10315,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10435,4 +10453,8 @@ msgid "Relation {0}" msgstr "Връзка {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Обект" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10553,5 +10575,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Забелязани са конфликти" @@ -11192,12 +11214,14 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Подготовка на примитивите за качване ..." @@ -11340,13 +11364,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11355,5 +11370,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11546,4 +11561,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11625,5 +11641,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11841,23 +11857,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Слой Данни {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "извън областта за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11866,11 +11882,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11879,32 +11895,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "неустановена" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Преобразувай в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12644,6 +12660,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12667,7 +12683,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12682,5 +12698,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13590,4 +13606,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Никога" @@ -13705,16 +13722,13 @@ msgstr "Бързо изрисуване (изглежда по-зле)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" -"Само интересните указатели на посока (примерно, при еднопосочни пътища)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Само в началото на път." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13874,25 +13888,30 @@ msgstr "GPS Точки" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Показване на направлението на сегментите на пътя." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Показване поредните номера на всички сегменти на пътя." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Приложи изглаждане върху картата." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Изобразяване границата на свалената от сървъра област." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -13901,9 +13920,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Изобразяване неактивните слоеве с данни в други цветове." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13911,5 +13930,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM Данни" @@ -15161,4 +15180,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Проверка" @@ -15792,5 +15812,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15844,9 +15864,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Тази версия на JOSM е несъвместима с конфигурирания сървър." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15855,21 +15875,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15877,69 +15897,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Създаване на списък с промени ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Успешно отворен списък с промени {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Обновяване списъка с промени ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Затваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Няма съществуващ набор промени за качване на разлики" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Изчакване 10 секунди " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "ОК - нов опит" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17498,5 +17518,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19418,5 +19438,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19670,4 +19690,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20372,5 +20393,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20475,4 +20496,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20673,22 +20698,22 @@ msgstr "изпълним файл на Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21322,4 +21347,14 @@ msgid "Waypoints" msgstr "Пътни точки" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Редактор релации: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22462,4 +22497,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22649,11 +22740,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24206,6 +24290,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24218,15 +24307,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Вкарва проблеми от OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24236,5 +24325,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24244,10 +24333,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24256,5 +24345,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24265,15 +24354,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великият JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24281,20 +24370,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24304,5 +24393,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24311,15 +24400,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Предоставя маршрутизиращи възможности." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24329,20 +24418,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволява добавянето на маркери/възли на текущата gps позиция." #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Предоставя диалог за редактиране на маркери в табличен вид." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24356,15 +24445,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Създава терасовидни къщи от един блок." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24373,5 +24462,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24380,10 +24469,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24392,15 +24487,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24410,5 +24505,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24417,20 +24512,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39852,4 +39947,328 @@ msgstr "Тест" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "съкретено име на улицата" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "маркер \"еднопосочна\" на точка" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "маркер \"мост\" на точка" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "неправилен маркер \"highway\" на точка" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Ненаименуван и некласифициран път" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "път без означение (highway без reference)" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "временен тип път" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "правописна грешка в името на ключа" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "велоалея с маркер \"велосипед\"" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "пешеходен път с маркер \"пеш\"" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "отделно платно за велосипедисти на велоалея" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "преграда по пътя на движение" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "макс. скорост за пешеходния път" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "маркер за слой със знак +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "името на улицата съдържа ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "релацията няма тип" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "ресторант без име" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "необичайна комбимация маркери" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Отворена въздушна карта (Open Aerial Map)" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Улици NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Карти" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Карти (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italy" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Сицилия - Италия" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "за {0} примитив" +#~ msgstr[1] "за {0} примитива" + #~ msgid "" #~ "There were problems with the following plugins:\n" @@ -40103,7 +40522,4 @@ #~ msgstr "Членове: {0}" -#~ msgid "Object" -#~ msgstr "Обект" - #~ msgid "Not implemented yet." #~ msgstr "Не е добавено още." @@ -40401,55 +40817,4 @@ #~ msgstr "Моторна лодка" -#~ msgid "unusual tag combination" -#~ msgstr "необичайна комбимация маркери" - -#~ msgid "barrier used on a way" -#~ msgstr "преграда по пътя на движение" - -#~ msgid "street name contains ss" -#~ msgstr "името на улицата съдържа ss" - -#~ msgid "abbreviated street name" -#~ msgstr "съкретено име на улицата" - -#~ msgid "maxspeed used for footway" -#~ msgstr "макс. скорост за пешеходния път" - -#~ msgid "layer tag with + sign" -#~ msgstr "маркер за слой със знак +" - -#~ msgid "restaurant without name" -#~ msgstr "ресторант без име" - -#~ msgid "bridge tag on a node" -#~ msgstr "маркер \"мост\" на точка" - -#~ msgid "oneway tag on a node" -#~ msgstr "маркер \"еднопосочна\" на точка" - -#~ msgid "highway without a reference" -#~ msgstr "път без означение (highway без reference)" - -#~ msgid "misspelled key name" -#~ msgstr "правописна грешка в името на ключа" - -#~ msgid "temporary highway type" -#~ msgstr "временен тип път" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "неправилен маркер \"highway\" на точка" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "велоалея с маркер \"велосипед\"" - -#~ msgid "footway with tag foot" -#~ msgstr "пешеходен път с маркер \"пеш\"" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "отделно платно за велосипедисти на велоалея" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Улици NRW Geofabrik.de" - #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" @@ -40458,10 +40823,4 @@ #~ msgstr "YAHOO (WebKit GTK)" -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Карти" - #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "подложка Oberpfalz Geofabrik.de" @@ -40472,10 +40831,4 @@ #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "Open Aerial Map" -#~ msgstr "Отворена въздушна карта (Open Aerial Map)" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Карти (Tim)" #~ msgid "Grid layer:" @@ -40796,4 +41149,8 @@ #~ msgstr "Създаване на не-аудио маркери при четене GPX." +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "" +#~ "Само интересните указатели на посока (примерно, при еднопосочни пътища)." + #~ msgid "" #~ "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines." @@ -41700,7 +42057,4 @@ #~ msgstr "Преместване нагоре" -#~ msgid "Relation Editor: {0}" -#~ msgstr "Редактор релации: {0}" - #~ msgid "Solve Conflict" #~ msgstr "Разрешаване конфликт" @@ -42102,16 +42456,4 @@ #~ msgstr "Изтриване на моите" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" @@ -42392,11 +42734,4 @@ #~ msgstr "Некоректна стойност на id оператора: {0}. Очаквано е число." -#~ msgid "" -#~ "Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for " -#~ "primitmive ''{1}''" -#~ msgstr "" -#~ "Внимание: слоя ''{0}'' вече не съществува. Не може да се разреши конфликт " -#~ "за примитив ''{1}''" - #~ msgid "removing reference from way {0}" #~ msgstr "премахване на справка от път {0}" @@ -42699,7 +43034,4 @@ #~ "Използване на съществуващия списък с промени {0}. След качване остава " #~ "отворен." - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Ненаименуван и некласифициран път" #~ msgid "Bikes" @@ -42901,10 +43233,4 @@ #~ msgstr "Изкуствени" -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - #~ msgid "Travel" #~ msgstr "Пътуване" @@ -42939,7 +43265,4 @@ #~ msgstr "Замяна" -#~ msgid "Upload all changes in the current data layer to the OSM server" -#~ msgstr "качване на всички промени в текущия слой данни към сървър на OSM." - #~ msgid "Illegal upload comment" #~ msgstr "Невалиден коментар на заявката за качване" @@ -42959,7 +43282,4 @@ #~ msgid "Added {0} objects" #~ msgstr "Добавени {0} обекта" - -#~ msgid "relation without type" -#~ msgstr "релацията няма тип" #~ msgid "line" @@ -42988,7 +43308,4 @@ #~ msgstr "Пътят \"до\" не започва или свършва в път \"през\"." -#~ msgid "Sicily - Italy" -#~ msgstr "Сицилия - Италия" - #~ msgid "Please enter a latitude in the range -90..90" #~ msgstr "Въведете геогр. ширина в диапазона [-90 .. 90]" @@ -43000,16 +43317,8 @@ #~ msgstr "Въведете геогр. дължина в диапазона [-180 .. 180]" -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japan (ORTHO03)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italy" +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Подчинената релация
{0}
е изтрита на сървъра. Не може да бъде " +#~ "заредена." Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 25650) +++ /applications/editors/josm/i18n/po/cs.po (revision 25651) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-02-24 20:18+0000\n" -"Last-Translator: hanoj \n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-11 11:10+0000\n" +"Last-Translator: Jezevec \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:25+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:29+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Nápověda" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoruji poškozený soubor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Varování" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parametr \"downloadgps\" neakceptuje jména souborů nebo URL" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorují se nekorektní URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -128,13 +128,13 @@ "(kompatibilní s Java 5).Více informací:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Ukončit JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Pokračovat, zkusit znovu" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -155,4 +155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -194,18 +195,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -224,4 +225,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "O aplikaci" @@ -308,8 +311,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "Varování: neočekávaný formát základní URL API. Přesměrování na informace " @@ -414,4 +417,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -496,5 +500,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -583,6 +587,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -625,51 +629,51 @@ msgstr "Vyberte minimálně 3 uzly" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "výběr" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "stáhnout" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "předchozí" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "následující" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Není zvoleno nic co by se dalo přiblížit" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Zvětšit na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Zvětšit pohled na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -679,5 +683,5 @@ msgstr "Zobrazení: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Není žádný konflikt, na který by se mohlo přiblížit" @@ -690,5 +694,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37 msgid "Toggle visibility of Changeset Manager window" -msgstr "" +msgstr "Nastavení viditelnosti okna správce datových změn." #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 @@ -978,9 +982,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Stáhnout prvky odkazující na jeden z vybraných prvků" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -989,5 +994,5 @@ msgstr "Duplikovat" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikovat výběr kopírováním a vložením." @@ -1095,5 +1100,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1459,5 +1464,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Sloučit vybrané prvky do jiné vrstvy" @@ -1726,7 +1732,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1750,10 +1756,10 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "na {0} objekt" -msgstr[1] "na {0} objekty" -msgstr[2] "na {0} objektů" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Smazat {0} objekt" +msgstr[1] "Smazat {0} objekty" +msgstr[2] "Smazat {0} objektů" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1814,4 +1820,6 @@ "discarded." msgstr "" +"Některé objekty byly modifikovány.
Pokud chcete tyto změny zahodit, " +"pokračujte." #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:280 @@ -1869,4 +1877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2093,4 +2102,5 @@ "The current selection cannot be used for splitting - no node is selected." msgstr "" +"Aktuální výběr není možno použít pro rozdělení - není vybrán žádný bod." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109 @@ -2417,13 +2427,13 @@ #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:21 msgid "Viewport Following" -msgstr "" +msgstr "Následování bodu" #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:23 msgid "Enable/disable automatic moving of the map view to last placed node" -msgstr "" +msgstr "Zapnutí/vypnutí automatického posunu mapy na naposledy umístěný bod" #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24 msgid "Toggle Viewport Following" -msgstr "" +msgstr "Přepínaní následování bodu" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23 @@ -2612,10 +2622,17 @@ "Click {0} to check the state of these objects on the server." msgstr[0] "" +"Klikněte na {0} pokud chcete ověřit stav tohoto objektu na " +"serveru." msgstr[1] "" +"Klikněte na {0} pokud chcete ověřit stav těchto objektů na " +"serveru." +msgstr[2] "" +"Klikněte na {0} pokud chcete ověřit stav těchto objektů na " +"serveru." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "Click {0} to ignore." -msgstr "" +msgstr "Pro ignorování klikněte na {0}." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178 @@ -2807,5 +2824,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2813,4 +2830,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -2978,5 +2996,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164 msgid "Also include incomplete and deleted objects in search." -msgstr "" +msgstr "Zahrnout do hledání i nekompletní a smazané objekty." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:165 @@ -3440,5 +3458,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3450,8 +3468,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Varovaní: Vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt prvku " @@ -3672,10 +3690,10 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Obnovit {0} objekt" -msgstr[1] "Obnovit {0} objekty" -msgstr[2] "Obnovit {0} objektů" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Smazat {0} objekt" +msgstr[1] "Smazat {0} objekty" +msgstr[2] "Smazat {0} objektů" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3981,5 +3999,5 @@ msgstr "Není v cache" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4037,8 +4055,9 @@ msgstr "Chybí cíl typu {0} pro sloučení s id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4196,5 +4215,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "pozadí" @@ -4900,5 +4919,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4912,4 +4931,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5407,6 +5427,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5526,7 +5546,7 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" -msgstr "Mapové zdroje" +msgstr "Mapové podklady" #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:92 @@ -5775,5 +5795,5 @@ msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5781,10 +5801,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Zobrazit" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5792,5 +5812,5 @@ msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5798,5 +5818,5 @@ msgstr "Předvolby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5807,5 +5827,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Zvuk" @@ -6209,11 +6229,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" -msgstr "" +#, fuzzy +msgid "Merging deleted objects failed" +msgstr "Obnovit objekt podle id" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 @@ -6485,8 +6506,10 @@ msgstr "Odkazováno z:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(žádný)" @@ -6526,5 +6549,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Prvek" @@ -6759,6 +6781,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6770,5 +6792,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6962,5 +6984,4 @@ msgstr "Otevřít historii příkazů" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6971,5 +6992,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6977,7 +6998,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7008,9 +7030,9 @@ msgstr "Konflikty: {0} nevyřešeno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Vyřešit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7018,5 +7040,5 @@ "seznamu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7592,11 +7614,11 @@ msgstr "Minimalizovat nebo maximalizovat obsah panelu" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autoři" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Otevřít seznam lidí, kteří pracuji na zvoleném objektu" @@ -7611,5 +7633,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Vybrat objekty nahrané tímto uživatelem" @@ -7682,4 +7705,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Opravit" @@ -7903,5 +7927,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Stáhnout a zobrazit historii vybraných prvků" @@ -7938,5 +7963,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Přiblížit na odpovídající prvky v aktuální datové vrstvě" @@ -9071,6 +9097,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "Přiblížit na objekty v obsahu této sady změn v aktuální datové vrstvě" @@ -9547,9 +9574,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054 msgid "Go to OSM wiki for tag help (F1)" -msgstr "" +msgstr "Podívat se informace o tagu na OSM wiki (F1)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Spustit prohlížeč s wiki nápovědou pro zvolený objekt" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9603,7 +9630,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Potomek relace
{0}
byl smazán na serveru. Nemůže být stažen" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9695,8 +9721,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -9705,5 +9731,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Více členů odkazuje na stejný prvek" @@ -9720,17 +9747,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects 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:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "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:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9739,6 +9767,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9747,5 +9776,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků" @@ -9757,17 +9787,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects 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:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" 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:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Vybrat prvky pro vybrané členy relace" @@ -9860,8 +9890,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9912,7 +9943,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Nastavujete prázdnou roli pro {0} objekt." msgstr[1] "Nastavujete prázdnou roli pro {0} objekty." @@ -9920,5 +9951,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Toto odpovídá smazání rolí těchto objektů." @@ -10200,6 +10232,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Klikněte pro stažení právě vybrané oblasti" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10211,5 +10243,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10293,4 +10325,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10375,5 +10408,6 @@ msgstr "JOSM prohlížeč nápovědy" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10381,17 +10415,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

Nápověda k vybranému tématu neexistuje

Nápověda na téma {0} není " -"dosud dostupná. Chybí jak vaše lokální jazyková verze ({1}) tak verze " -"anglická.

Prosíme pomozte vylepšit JOSM a doplňte chybějící " -"informace. Můžete upravovat nápovědu ve vašem jazyce ({1}) a v angličtině.

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10405,5 +10433,5 @@ "nepodařilo získat. Chybové hlášení (nepřeloženo):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10412,19 +10440,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Nepodařilo se otevřít URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Otevřít aktuální stránku nápovědy v externím prohlížeči" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Upravit aktuální stránku nápovědy" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10436,33 +10464,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Znovu načíst aktuální stránku nápovědy" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Přejít na předchozí stránku" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Přejít na následující stránku" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Jít na domovskou stránku nápovědy pro JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Nepodařilo se otevřít stránku s nápovědou. Cílové URL je prázdné." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Nepodařilo se otevřít stránku s nápovědou." @@ -10574,4 +10602,8 @@ msgid "Relation {0}" msgstr "Relace {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10692,5 +10724,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Objeveny konflikty" @@ -11348,14 +11380,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a " -"opakuji přenos." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Varování: objekt ''{0}'' je na serveru již smazán. Přeskakuji tento objekt a " +"opakuji nahrávání." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Připravuji objekty k nahrání na server ..." @@ -11512,15 +11546,4 @@ msgstr "Sada změn je plná" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Varování: objekt ''{0}'' je na serveru již smazán. Přeskakuji tento objekt a " -"opakuji nahrávání." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11529,5 +11552,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11727,4 +11750,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11809,5 +11833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12023,23 +12047,23 @@ msgstr "CHYBA" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Datová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "mimo stažený areál" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "verze {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12049,11 +12073,11 @@ msgstr[2] "Bylo nalezeno {0} konfliktů." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Klikněte pro uzavření tohoto dialogu a návrat k editaci" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12063,32 +12087,32 @@ msgstr[2] "{0} smazáno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "nenastaveno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Verze API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Převédst do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Test konzistence dat" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Nenalezen žádný problém" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Nalezeny následující problémy:" @@ -12831,6 +12855,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12854,7 +12878,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12869,5 +12893,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13799,4 +13823,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Žádný" @@ -13914,15 +13939,13 @@ msgstr "Rychlé vykreslování (vypadá ošklivě)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Jen zajímavé směry (např. jednosměrka)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Pouze na prvním úseku cesty." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14074,34 +14097,39 @@ msgstr "GPS body" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Zobrazovat směr u segmentů cesty." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Zobrazovat pořadí u všech segmentů v cestách." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Zobrazovat hranice dat stažených ze serveru." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14109,5 +14137,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM data" @@ -15386,4 +15414,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Ověřit" @@ -16025,7 +16054,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Server odpověděl chybovým kódem 404, opakování s individuálním požadavkem " @@ -16082,9 +16112,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16093,21 +16123,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16116,69 +16146,69 @@ "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Vytvářím sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Úspěšně otevřená sada změn {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Sada změn s ID > 0 očekávána. Nalezeno {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Aktualizuji sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Aktualizuji sadu změn {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Zavírám sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Není k dizpozici sada změn pro rozdílový upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Připravuji požadavak na nahrání..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Čekám 10 sekund ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Zkusím nový pokus, {0} z {1}, během {2} sekund ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - další pokus." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Zahajuji pokus {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Současná sada změn je plná. Nelze nahrávat data na server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17784,5 +17814,5 @@ msgstr "Chyba na řádku " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "Chybějící audio soubor" @@ -19713,5 +19743,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19965,4 +19995,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20665,5 +20696,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20767,4 +20798,8 @@ msgstr "Jedna z vybraných cest je již součástí jiného multipolygonu." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20967,22 +21002,22 @@ msgstr "Spustitelný soubor Firefoxu" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "Chyba transformace: Minimální X musí být menší, než maximální" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "Chyba transformace: Minimální Y musí být menší, než maximální" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "Chyba transformace: Body jsou příliš blízko" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Chyba transformace: Nepodporovaná varianta" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Chyba transformace: Nepodporovaná orientace" @@ -21616,4 +21651,14 @@ msgid "Waypoints" msgstr "Silniční body" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Editor relací: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22757,4 +22802,60 @@ msgstr "Vytvořit nový podepisovací klíč" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22948,11 +23049,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24514,6 +24608,11 @@ msgstr "Jednoduchá konverze oblasti(area) do multipolygonu." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24526,15 +24625,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje problémy z OpenStreetBugs." #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24543,5 +24642,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24550,10 +24649,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24564,5 +24663,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24573,15 +24672,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ohromný JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24589,20 +24688,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Plugin pro vracení sad změn zpět (revert)" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24615,5 +24714,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24624,15 +24723,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Poskytuje směrování" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24642,20 +24741,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24665,15 +24764,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Vytváření řadových domků z jednotlivých bloků." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "Vytáření a úpravy vodních cest pro OpenSeaMap" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24682,5 +24781,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24691,10 +24790,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "Plugin pro digitální podepisování OSM-dat" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24705,15 +24810,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "Umožňuje obnovování smazaných objektů z OSM databáze" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24723,5 +24828,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24732,20 +24837,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Snadné stahovaní velmi dlouhých propojených cest" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "Umožňuje vyhledávat waypointy importované z gps souboru." #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 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:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40169,4 +40274,342 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "zkrácené jméno ulice" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "tag jednosměrky (oneway) na uzlu" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "tag mostu (bridge) na uzlu" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "špatný silniční (highway) tag na uzlu" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Nepojmenovaná neklasifikovaná silnice" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "silnice bez reference" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "dočasný typ silnice" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "překlep ve jménu klíče" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "\"cycleway\" (cyklostezka) s tagem \"bicycle\"" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "\"footway\" (pěšina) s tagem \"foot\"" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "Navíc cyklostezka jako pruh na cyklostezce" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "tag \"barrier\" (překážka) použitý na cestě" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "\"footway\" (pěšina) s tagem \"maxspeed\"" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "tag \"layer\" se znaménkem +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "jméno ulice obsahuje ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relace bez typu" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurace bez jména" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "neobvyklá kombinace tagů" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Ulice NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "český CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "český UHUL:ortofoto" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Mapy" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Mapy (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Itálie" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicily - Itálie" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "na {0} objekt" +#~ msgstr[1] "na {0} objekty" +#~ msgstr[2] "na {0} objektů" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Obnovit {0} objekt" +#~ msgstr[1] "Obnovit {0} objekty" +#~ msgstr[2] "Obnovit {0} objektů" + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek " +#~ "a opakuji přenos." + #~ msgid "File could not be found." #~ msgstr "Soubor nebyl nalezen" @@ -40273,7 +40716,4 @@ #~ msgid "my version:" #~ msgstr "moje verze:" - -#~ msgid "Object" -#~ msgstr "Objekt" #~ msgid "Unsaved Changes" @@ -40428,4 +40868,7 @@ #~ msgstr "Chyba při parsování" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Jen zajímavé směry (např. jednosměrka)" + #~ msgid "Combine ways with different memberships?" #~ msgstr "Spojit cesty patřící do jiné relace?" @@ -40556,7 +40999,4 @@ #~ msgstr "Upravit pozici WMS vrstvy" -#~ msgid "Landsat" -#~ msgstr "Landsat" - #~ msgid "YAHOO (WebKit)" #~ msgstr "YAHOO (WebKit)" @@ -40664,7 +41104,4 @@ #~ msgstr "" #~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie." - -#~ msgid "NPE Maps" -#~ msgstr "NPE Mapy" #~ msgid "YAHOO (GNOME Fix)" @@ -40731,28 +41168,4 @@ #~ msgstr "ragby" -#~ msgid "bridge tag on a node" -#~ msgstr "tag mostu (bridge) na uzlu" - -#~ msgid "oneway tag on a node" -#~ msgstr "tag jednosměrky (oneway) na uzlu" - -#~ msgid "highway without a reference" -#~ msgstr "silnice bez reference" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "špatný silniční (highway) tag na uzlu" - -#~ msgid "temporary highway type" -#~ msgstr "dočasný typ silnice" - -#~ msgid "misspelled key name" -#~ msgstr "překlep ve jménu klíče" - -#~ msgid "street name contains ss" -#~ msgstr "jméno ulice obsahuje ss" - -#~ msgid "abbreviated street name" -#~ msgstr "zkrácené jméno ulice" - #~ msgid "Permitted actions" #~ msgstr "Povolené akce" @@ -40929,7 +41342,4 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" #~ msgid "Some of the nodes are (almost) in the line" @@ -41071,13 +41481,4 @@ #~ msgstr "Sorry, nefunguje s anonymními uživateli." -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Ulice NRW Geofabrik.de" - -#~ msgid "unusual tag combination" -#~ msgstr "neobvyklá kombinace tagů" - -#~ msgid "restaurant without name" -#~ msgstr "restaurace bez jména" - #~ msgid "Parse error: invalid document structure for gpx document" #~ msgstr "Chyba parsování: Chybná struktura GPX dokumentu" @@ -41223,7 +41624,4 @@ #~ msgstr "standardní" -#~ msgid "relation without type" -#~ msgstr "relace bez typu" - #~ msgid "Drawbridge" #~ msgstr "Padací most" @@ -41404,25 +41802,4 @@ #~ msgid "Grid rotation" #~ msgstr "Otočení mřížky" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Mapy (Tim)" - -#~ msgid "maxspeed used for footway" -#~ msgstr "\"footway\" (pěšina) s tagem \"maxspeed\"" - -#~ msgid "barrier used on a way" -#~ msgstr "tag \"barrier\" (překážka) použitý na cestě" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "\"cycleway\" (cyklostezka) s tagem \"bicycle\"" - -#~ msgid "footway with tag foot" -#~ msgstr "\"footway\" (pěšina) s tagem \"foot\"" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "Navíc cyklostezka jako pruh na cyklostezce" - -#~ msgid "layer tag with + sign" -#~ msgstr "tag \"layer\" se znaménkem +" #~ msgid "Station" @@ -41592,7 +41969,4 @@ #~ msgid "Move Up" #~ msgstr "Posunout nahoru" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editor relací: {0}" #~ msgid "Solve Conflict" @@ -43068,21 +43442,6 @@ #~ msgstr "Uložit a smazat" -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Nepojmenovaná neklasifikovaná silnice" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" #~ msgid "Missing mandatory attribute ''{0}''" @@ -43519,4 +43878,7 @@ #~ "Unable to add primitive {0} to the dataset because it's already included" #~ msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je" + +#~ msgid "Click do download the currently selected area" +#~ msgstr "Klikněte pro stažení právě vybrané oblasti" #~ msgid "" @@ -43651,25 +44013,4 @@ #~ "obrazovku mnoha okny
a může to též chvíli trvat." -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Itálie" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicily - Itálie" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japan (ORTHO03)" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japan (ORTHO01)" - #~ msgid "Looking up available translations..." #~ msgstr "Vyhledávám dostupné překlady ..." @@ -43689,10 +44030,4 @@ #~ msgid "You've encountered a bug in JOSM" #~ msgstr "Narazili jste na chybu v JOSM" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "český UHUL:ortofoto" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "český CUZK:KM" #~ msgid "Footway" @@ -43815,4 +44150,10 @@ #~ msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Potomek relace
{0}
byl smazán na serveru. Nemůže být stažen" + #~ msgid "Cannot open directory.
Please select a file!" #~ msgstr "Nemohu otevřít adresář.
Prosím vyberte soubor!" @@ -43833,4 +44174,20 @@ #~ "je napojena na cestu {3}." +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

Nápověda k vybranému tématu neexistuje

Nápověda na téma {0} není " +#~ "dosud dostupná. Chybí jak vaše lokální jazyková verze ({1}) tak verze " +#~ "anglická.

Prosíme pomozte vylepšit JOSM a doplňte chybějící " +#~ "informace. Můžete upravovat nápovědu ve vašem jazyce ({1})" +#~ " a v angličtině.

" + #~ msgid "UTM 20N (France)" #~ msgstr "UTM 20N (Francie)" @@ -43867,4 +44224,7 @@ #~ msgstr "Interní styl" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Spustit prohlížeč s wiki nápovědou pro zvolený objekt" + #~ msgid "Key Signatures" #~ msgstr "Podpisy klíče" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 25650) +++ /applications/editors/josm/i18n/po/da.po (revision 25651) @@ -9,7 +9,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-02-28 22:21+0000\n" -"Last-Translator: Peter Brodersen \n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-10 11:05+0000\n" +"Last-Translator: Jens Hyllegaard \n" "Language-Team: Dansk \n" "MIME-Version: 1.0\n" @@ -17,15 +17,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:15+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:29+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -35,12 +35,12 @@ msgstr "Hjælp" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorerer misformet fil-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -76,7 +76,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -109,14 +109,14 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" accepterer ikke filnavne eller fil-URL'er" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorerer misformet URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -125,14 +125,17 @@ "version of JOSM.More Info:" msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:761 +"

JOSM kræver Java version 6.

Opdaget Java version: {0}.
Du kan " +"
  • opdaterer din Java (JRE) eller
  • bruge en tidligere (Java 5 " +"kompatibel) version af JOSM.
Mere Info:" + +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Afslut JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Fortsæt, prøv alligevel" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -153,4 +156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -192,18 +196,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -222,4 +226,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Om" @@ -306,8 +312,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "Advarsel: uventet format af API base URL. Redirektion til info or historik " @@ -411,4 +417,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -493,5 +500,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -580,6 +587,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -622,51 +629,51 @@ msgstr "Vælg venligst mindst tre punkter." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "lag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "markering" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "download" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "forrige" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "næste" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Intet markeret at zoome ind på." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Zoom til {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Zoom synsfeltet til {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -676,5 +683,5 @@ msgstr "Vis: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Ingen konflikter at zoome ind på." @@ -977,9 +984,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Download primitiver, der refererer til en af de valgte primitiver." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -988,5 +996,5 @@ msgstr "Duplikér" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikér markering ved kopiering og umiddelbar indsættelse" @@ -1094,5 +1102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1147,5 +1155,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:169 msgid "Bookmark name: " -msgstr "" +msgstr "Bogmærkenavn: " #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:219 @@ -1176,5 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:327 msgid "One of the selected ways is not closed and therefore cannot be joined." -msgstr "" +msgstr "En af de valgte veje er ikke lukket, og kan derfor ikke sammenføjes." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340 @@ -1215,5 +1223,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442 msgid "Removed duplicate nodes" -msgstr "" +msgstr "Fjernede punkt-dubletter" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:451 @@ -1223,5 +1231,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505 msgid "Assemble new polygons" -msgstr "" +msgstr "Konstruer nye polygoner" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511 @@ -1262,4 +1270,6 @@ "Sorry. Cannot handle way that is outer in multiple multipolygon relations." msgstr "" +"Beklager. Kan ikke håndtere veje som er yderst i flere multipolygon " +"relationer." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256 @@ -1269,4 +1279,6 @@ "relations." msgstr "" +"Beklager. Kan ikke håndtere veje som er både inderst og yderst i " +"multipolygon relationer." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1268 @@ -1274,4 +1286,5 @@ "Sorry. Cannot handle way that is inner in multiple multipolygon relations." msgstr "" +"Beklager. Kan ikke håndtere veje som er inderst i en multipolygon relation." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370 @@ -1455,5 +1468,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Saml de nu markerede primitiver i et andet lag" @@ -1731,8 +1745,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "De kopierede data indeholder ufuldstændige primitiver. Ved indsætning bliver " @@ -1758,9 +1773,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "til {0} primitiv" -msgstr[1] "til {0} primitiver" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Slet {0} objekt" +msgstr[1] "Slet {0} objekter" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1785,5 +1800,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61 msgid "Forget objects but do not delete them on server when uploading." -msgstr "" +msgstr "Fjern objekter, men slet dem ikke fra serveren ved upload." #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:62 @@ -1802,4 +1817,7 @@ "uploading." msgstr "" +"Denne operation får JOSM til at glemme de valgte objekter
Disse vil " +"blive fjernet fra laget, men ikke slettet fra
serveren ved " +"upload." #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:229 @@ -1808,4 +1826,6 @@ "selected objects:" msgstr "" +"Udover det valgte objekt, vil disse afhængige
objekter også blive " +"slettet:" #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:260 @@ -1875,4 +1895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2359,4 +2380,6 @@ "''{0}''.
You have to resolve them first." msgstr "" +"Data som skal uploades er en del af en u-løst konflikt i lag ''{0}''." +"
Konflikten skal løses før upload." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 @@ -2420,4 +2443,6 @@ msgid "Enable/disable automatic moving of the map view to last placed node" msgstr "" +"Aktivér/deaktivér automatisk flytning af kortvisningen til det sidste " +"placerede punkt" #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24 @@ -2601,5 +2626,11 @@ "report a conflict." msgstr[0] "" +"Der er {0} objekt i dit lokale datasæt der kan være slettet på serveren. " +"Hvis du senere prøver at slette eller opdatere dette vil serveren " +"sandsynligvis rapportere en fejl." msgstr[1] "" +"Der er {0} objekter i dit lokale datasæt der kan være slettet på serveren. " +"Hvis du senere prøver at slette eller opdatere disse vil serveren " +"sandsynligvis rapportere en fejl." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169 @@ -2610,5 +2641,7 @@ "Click {0} to check the state of these objects on the server." msgstr[0] "" +"Klik {0} for at tjekke status på dette objekt på serveren." msgstr[1] "" +"Klik {0} for at tjekke status på disse objekter på serveren." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 @@ -2806,5 +2839,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2812,4 +2845,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -2818,5 +2852,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:104 msgid "Select, move, scale and rotate objects" -msgstr "" +msgstr "Vælg, flyt, skalér eller rotér objekter" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:192 @@ -2867,5 +2901,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:687 msgid "Release the mouse button to stop scaling." -msgstr "" +msgstr "Slip museknappen for at stoppe skalering." #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:689 @@ -2874,4 +2908,7 @@ "Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection" msgstr "" +"Flyt objekter ved at trække; Shift for at tilføje til udvælgningen (Ctrl for " +"at skifte); Shit-Ctrl for at rotere valgte; Alt-Ctrl for at skalere valgte; " +"eller ændre valg" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44 @@ -3075,5 +3112,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "role:... - object with given role in a relation" -msgstr "" +msgstr "rolle:... - objekt med en given rolle i en relation" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 @@ -3278,10 +3315,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:696 msgid "Primitive id expected" -msgstr "" +msgstr "Primitiv-id forventet" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:698 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701 msgid "Range of numbers expected" -msgstr "" +msgstr "Forventet talområde" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704 @@ -3291,5 +3328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:706 msgid "Version expected" -msgstr "" +msgstr "Forventet version" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:59 @@ -3429,5 +3466,5 @@ #, java-format msgid "Remove \"{0}\" for {1} objects" -msgstr "" +msgstr "Fjern \"{0}\" for {1} objekter" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:124 @@ -3442,7 +3479,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3456,8 +3493,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Advarsel: Lag ''{0}'' eksisterer ikke længere. Kan ikke fjerne konflikt for " @@ -3602,6 +3639,6 @@ msgid "Purged {0} object" msgid_plural "Purged {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Slette {0} objekt" +msgstr[1] "Slette {0} objekter" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 @@ -3641,6 +3678,6 @@ msgid "Scale {0} node" msgid_plural "Scale {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Skalér {0} punkt" +msgstr[1] "Skalér {0} punkter" #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:93 @@ -3667,28 +3704,28 @@ msgid "Transform {0} node" msgid_plural "Transform {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Transformer {0} punkt" +msgstr[1] "Transformer {0} punkter" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Slet {0} objekt" +msgstr[1] "Slet {0} objekter" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 #, java-format msgid "Resolve version conflict for node {0}" -msgstr "" +msgstr "Løs versionskonflikt for punkt {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:39 #, java-format msgid "Resolve version conflict for way {0}" -msgstr "" +msgstr "Løs versionskonflikt for vejen {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 #, java-format msgid "Resolve version conflict for relation {0}" -msgstr "" +msgstr "Løs versionskonflikten for relationen {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:49 @@ -3775,24 +3812,24 @@ #, java-format msgid "Unable to create file {0}, other filename will be used" -msgstr "" +msgstr "Kunne ikke oprette filen {0}, andet filnavn vil blive brugt" #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:153 #, java-format msgid "IOError while creating file, autosave will be skipped: {0}" -msgstr "" +msgstr "IO-fejl ved oprettelse af filen, autogem vil blive sprunget over: {0}" #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:175 #, java-format msgid "Unable to delete old backup file {0}" -msgstr "" +msgstr "Kunne ikke slette gammel backupfil {0}" #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:238 #, java-format msgid "Error while creating backup of removed layer: {0}" -msgstr "" +msgstr "Fejl ved oprettelse af backup for fjernet lag: {0}" #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:268 msgid "Restoring files" -msgstr "" +msgstr "Gendanner filer" #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75 @@ -3930,5 +3967,5 @@ #: ../core/src/org/openstreetmap/josm/data/Version.java:145 msgid "Warning: the revision file ''/REVISION'' is missing." -msgstr "" +msgstr "Advarsel: revisionsfilen \"/REVISION\" mangler." #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76 @@ -3949,5 +3986,5 @@ #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20 msgid "deg° min'' sec\"" -msgstr "" +msgstr "grad° min'' sek\"" #. * @@ -3989,5 +4026,5 @@ msgstr "Ikke i mellemlager" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4050,8 +4087,9 @@ msgstr "Manglende sammenlægningsmål af type {0} med id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4212,5 +4250,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "baggrund" @@ -4429,5 +4467,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18 msgid "validation other" -msgstr "" +msgstr "validering andet" #: ../core/src/org/openstreetmap/josm/data/validation/Test.java:100 @@ -4560,5 +4598,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:83 msgid "Duplicated ways" -msgstr "" +msgstr "Dupplikerede veje" #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:68 @@ -4713,5 +4751,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:40 msgid "Relation checker :" -msgstr "" +msgstr "Relationstjekker :" #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:41 @@ -4927,5 +4965,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4939,4 +4977,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5439,6 +5478,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5556,5 +5595,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Billedlag" @@ -5804,5 +5843,5 @@ msgstr "Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5810,10 +5849,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5821,5 +5860,5 @@ msgstr "Funktioner" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5827,5 +5866,5 @@ msgstr "Fordefinerede" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5836,5 +5875,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Lyd" @@ -6235,11 +6274,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" -msgstr "" +#, fuzzy +msgid "Merging deleted objects failed" +msgstr "Kun for de valgte elementer" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 @@ -6520,8 +6560,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "ingen" @@ -6561,5 +6603,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitiv" @@ -6795,6 +6836,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6805,5 +6846,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7011,5 +7052,4 @@ msgstr "Åbn en liste over alle kommandoer (fortryd-oversigt)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7020,5 +7060,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7026,7 +7066,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7057,9 +7098,9 @@ msgstr "Konflikter: {0} uløst" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7067,5 +7108,5 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7641,11 +7682,11 @@ msgstr "Klik for at minimere/maksimere panelet" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Forfattere" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Åbn en liste over brugere, der arbejder på de valgte objekter." @@ -7659,5 +7700,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Markér primitiver indsendt af denne bruger" @@ -7729,4 +7771,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Ret" @@ -7951,5 +7994,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Download og vis de markerede primitivers historik" @@ -7990,5 +8034,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Zoom til de tilsvarende primitiver i det nuværende datalag" @@ -9123,6 +9168,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9621,5 +9667,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9673,7 +9719,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Børnerelationen
{0}
er slettet fra serveren. Den kan ikke hentes." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9763,8 +9808,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -9774,5 +9819,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Flere medlemmer der refererer til samme primitiv." @@ -9789,12 +9835,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "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:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Tilføj alle primitiver markeret i det nuværende datasæt efter det sidste " @@ -9802,6 +9848,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9810,6 +9857,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9818,5 +9866,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Fjern alle medlemmer der refererer til en af de markerede primitiver" @@ -9828,6 +9877,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "" "Vælg relationsmedlemmer der refererer til primitiver i den nuværende " @@ -9835,8 +9884,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Vælg relationsmedlemmer der refererer til {0} primitiver i den nuværende " @@ -9844,5 +9892,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Markér primitiver for markerede relationsmedlemmer" @@ -9938,11 +9987,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"Lag ''{0}'' har allerede en konflikt for primitiv
''{1}''.
Løs " -"venligst denne konflikt først og prøv så igen." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -9993,11 +10041,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -10283,6 +10331,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Klik for at downloade det nu markerede område" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10294,9 +10342,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Hverken {0} eller {1} er slået til." -"
Vælg venligst enten at downloade OSM-data, GPX-data eller begge dele." +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10379,4 +10424,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10461,5 +10507,6 @@ msgstr "JOSM's Hjælp-browser" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10467,11 +10514,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10482,5 +10529,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10491,19 +10538,19 @@ "sandsynligvis et netværksproblem
. Tjek din Internet-forbindelse" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Kunne ikke åbne URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Åbn den nuværende Hjælp-side i en ekstern browser" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Redigér den nuværende Hjælp-side" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10515,33 +10562,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Hent den nuværende Hjælp-side igen" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Gå til foregående side" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Gå til næste side" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Gå til JOSM's Hjælp-hjemmeside" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Kunne ikke åbne Hjælp-side. URL'en er tom." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Kunne ikke åbne Hjælp-side" @@ -10657,4 +10704,8 @@ msgid "Relation {0}" msgstr "Relation {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10779,5 +10830,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Konflikter opdaget" @@ -11452,14 +11503,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Advarsel: Primitiv ''{0}'' er allerede slettet fra serveren. Skipper denne " -"primitiv og prøver at uploade igen" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Advarsel: objekt ''{0}'' er allerede slettet fra serveren. Springer over " +"dette objekt og prøver igen at uploade." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Gør primitiver klar til upload ..." @@ -11607,15 +11660,4 @@ msgstr "Rettesættet er fyldt" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Advarsel: objekt ''{0}'' er allerede slettet fra serveren. Springer over " -"dette objekt og prøver igen at uploade." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11624,5 +11666,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11828,4 +11870,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11907,5 +11950,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12130,23 +12173,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "Uden for det downloadede område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Advarsel: At blande 0.6 og 0.5 data resulterer i version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12155,11 +12198,11 @@ msgstr[1] "Der blev opdaget {0} konflikter" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Klik for at lukke denne dialog og fortsætte med at redigere" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12168,32 +12211,32 @@ msgstr[1] "{0} slettet" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "nulstil" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API-version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Datasætskonsistenstest" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Fandt ingen problemer" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Følgende problemer blev fundet:" @@ -12939,6 +12982,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12962,7 +13005,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12977,5 +13020,5 @@ msgstr "Ulovligt streg-mønster. Mindst en værdi skal være over > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13836,9 +13879,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:45 msgid "Auto save enabled" -msgstr "" +msgstr "Autogem aktiveret" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49 msgid "Auto save interval (seconds)" -msgstr "" +msgstr "Autogem interval (sekunder)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52 @@ -13850,5 +13893,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56 msgid "Auto saved files per layer" -msgstr "" +msgstr "Autogemte filer pr. lag" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64 @@ -13933,4 +13976,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Ingen" @@ -14047,15 +14091,13 @@ msgstr "Hurtig optegning (ser grimmere ud)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Kun ved enden af vejen." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14081,5 +14123,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 msgid "Create markers when reading GPX." -msgstr "" +msgstr "Opret markører ved læsning af GPX." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62 @@ -14101,5 +14143,5 @@ msgctxt "gpx_field" msgid "Desc(ription)" -msgstr "" +msgstr "Beskrivelse(Desc)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64 @@ -14213,25 +14255,30 @@ msgstr "GPS-punkter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Tegn retningsvisere på vejstykker" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Tegn ordensnumrene på alle segmenter i deres vej." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Brug udjævning på kortvisningen for et mere glat udseende." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Tegn omridset af data hentet fra serveren." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14239,9 +14286,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Tegn inaktive datalag i en anden farve." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14249,5 +14296,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM-data" @@ -14351,5 +14398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276 msgid "Imagery providers" -msgstr "" +msgstr "Billedlag leverandører" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:278 @@ -14359,9 +14406,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:417 msgid "Available default entries:" -msgstr "" +msgstr "Tilgængelige standardemner:" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:443 msgid "Selected entries:" -msgstr "" +msgstr "Valgte elementer" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:461 @@ -14926,13 +14973,13 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:47 msgid "Load data from API" -msgstr "" +msgstr "Indlæs data fra API" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:48 msgid "Import data from URL" -msgstr "" +msgstr "Importer data fra URL" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:49 msgid "Load imagery layers" -msgstr "" +msgstr "Indlæs billedlag" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:50 @@ -14954,17 +15001,17 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54 msgid "Confirm all Remote Control actions manually" -msgstr "" +msgstr "Bekræft alle fjernstyring hændelser manuelt" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58 msgid "Remote Control" -msgstr "Fjernbetjening" +msgstr "Fjernstyring" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58 msgid "Settings for the remote control feature." -msgstr "" +msgstr "Indstillinger for fjernstyringsfunktionen" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:60 msgid "Enable remote control" -msgstr "" +msgstr "Aktivér fjernstyring" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:69 @@ -14973,8 +15020,10 @@ "applications, e.g. from a web browser." msgstr "" +"Fjernstyringsfunktionen lader JOSM blive styret fra andre programmer, f.eks. " +"fra en webbrowser." #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:74 msgid "Permitted actions:" -msgstr "" +msgstr "Tilladte handlinger:" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88 @@ -15027,5 +15076,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:313 msgid "Icon paths:" -msgstr "" +msgstr "Ikonstier:" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634 @@ -15267,5 +15316,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:85 msgid "Show informational level." -msgstr "" +msgstr "Vis informationsniveau." #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:86 @@ -15337,8 +15386,10 @@ "startup after an update of JOSM itself." msgstr "" +"Angiv venligst hvorvidt JOSM automatisk skal opdaterer aktive udvidelser ved " +"opstart efter JOSM selv er opdateret." #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96 msgid "Update interval (in days):" -msgstr "" +msgstr "Opdaterings-interval (i dage):" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128 @@ -15347,4 +15398,6 @@ "certain periode of time." msgstr "" +"Angiv venligst hvorvidt JOSM automatisk skal opdaterer aktive udvidelser " +"efter et bestemt stykke tid." #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51 @@ -15519,11 +15572,12 @@ #, java-format msgid "Use the default OSM server URL ({0})" -msgstr "" +msgstr "Brug standard OSM server-URL ({0})" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:89 msgid "OSM Server URL:" -msgstr "OSM Server URL:" +msgstr "OSM server-URL:" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Validér" @@ -16175,7 +16229,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Server svarede med svarkode 404. Prøver igen med en individuel anmodning for " @@ -16231,9 +16286,9 @@ msgstr "Indstilling \"{0}\" mangler. Kan ikke initialisere OSM-API." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Denne version af JOSM er ikke kompatibel med den konfigurerede server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16244,21 +16299,21 @@ "{0} til {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikation med {0} etablereret ved hjælp af protokol version {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Uventet ID-format svaret af serveren. Fik \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16266,69 +16321,69 @@ msgstr "Uventet format af ny version af ændret primitiv \"{0}\". Fik \"{1}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Opretter rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Åbnede med succes rettesæt {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Rettesæts-ID > 0 forventet. Fik {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Opdaterer rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Opdaterer rettesæt {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Lukker rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Ingen rettesæt tilstede for diff-upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Forbereder upload-forespørgsel..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Venter 10 sekunder ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Starter forsøg {0} af {1} igen om {2} sekunder ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - prøver igen" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starter forsøg {0} af {1} igen." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Nuværende rettesæt er null. Kan ikke uploade data." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "Rettesæt med ID > 0 krævet. Nuværende ID er {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17065,5 +17120,5 @@ #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java:142 msgid "Confirm Remote Control action" -msgstr "Bekræft Fjernbetjenings-handling" +msgstr "Bekræft Fjernstyrings-handling" #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/VersionHandler.java:30 @@ -17820,5 +17875,5 @@ #: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:55 msgid "unused" -msgstr "" +msgstr "ubrugt" #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 @@ -17934,5 +17989,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19849,5 +19904,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -20102,4 +20157,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20169,5 +20225,5 @@ #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:108 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer." -msgstr "" +msgstr "Importér data fra Globalsat Datalogger DG100 til GPX lag." #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:115 @@ -20790,5 +20846,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20892,4 +20948,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21089,22 +21149,22 @@ msgstr "Firefox-programfil" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21738,4 +21798,14 @@ msgid "Waypoints" msgstr "Vejpunkter" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relations-editor: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22877,4 +22947,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23064,11 +23190,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24637,6 +24756,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24646,15 +24770,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer sager fra OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24663,5 +24787,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24670,10 +24794,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24682,5 +24806,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24691,15 +24815,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24707,20 +24831,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24730,5 +24854,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24739,15 +24863,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Tilføjer ruteplan-egenskaber" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24757,20 +24881,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24783,15 +24907,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Laver rækkehuse ud af en enkelt blok." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24800,5 +24924,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24807,10 +24931,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24819,15 +24949,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24837,5 +24967,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24846,20 +24976,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40281,4 +40411,342 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "forkortet gadenavn" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "Envejs-tag på et punkt" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "Bro-tag på et punkt" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "Forkert landevej-tag på et punkt" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Unavngivet uklassificeret vej" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "Landevej uden reference" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "midlertidig landevejstype" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "fejlstavet nøgle" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "cykelsti med tag cykel" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "adskilt cykelsti som spor på en cykelsti" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "barriere brugt på en vej" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "maks. hastighed angivet for gangsti" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "Lag-tag med \"+\"-tegn" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "vejnavn indeholder \"ss\"" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relation uden type" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurant uden navn" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "usædvanlig kombination af tags" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Hent luftkort" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE-kort" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE kort (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italien" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicilen - Italien" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "til {0} primitiv" +#~ msgstr[1] "til {0} primitiver" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Lag ''{0}'' har allerede en konflikt for primitiv
''{1}''." +#~ "
Løs venligst denne konflikt først og prøv så igen." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Advarsel: Primitiv ''{0}'' er allerede slettet fra serveren. Skipper " +#~ "denne primitiv og prøver at uploade igen" + #~ msgid "Move" #~ msgstr "Flyt" @@ -40437,7 +40905,4 @@ #~ msgstr "Kan ikke forbinde til serveren." -#~ msgid "Object" -#~ msgstr "Objekt" - #~ msgid "There are unsaved changes. Delete the layer anwyay?" #~ msgstr "Der er ugemte ændringer. Skal laget alligevel slettes?" @@ -40885,7 +41350,4 @@ #~ msgid "osmarender options" #~ msgstr "osmarender-indstillinger" - -#~ msgid "abbreviated street name" -#~ msgstr "forkortet gadenavn" #~ msgid "Boat" @@ -41148,10 +41610,4 @@ #~ msgstr "Dupliker vej" -#~ msgid "relation without type" -#~ msgstr "relation uden type" - -#~ msgid "restaurant without name" -#~ msgstr "restaurant uden navn" - #~ msgid "Bridleway" #~ msgstr "Ridesti" @@ -41271,42 +41727,6 @@ #~ msgstr "Farvelægger problem" -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE-kort" - #~ msgid "Please choose a user using the author panel" #~ msgstr "Vælg venligst en bruger fra forfatter-panelet" - -#~ msgid "bridge tag on a node" -#~ msgstr "Bro-tag på et punkt" - -#~ msgid "oneway tag on a node" -#~ msgstr "Envejs-tag på et punkt" - -#~ msgid "highway without a reference" -#~ msgstr "Landevej uden reference" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "Forkert landevej-tag på et punkt" - -#~ msgid "misspelled key name" -#~ msgstr "fejlstavet nøgle" - -#~ msgid "temporary highway type" -#~ msgstr "midlertidig landevejstype" - -#~ msgid "unusual tag combination" -#~ msgstr "usædvanlig kombination af tags" - -#~ msgid "barrier used on a way" -#~ msgstr "barriere brugt på en vej" - -#~ msgid "layer tag with + sign" -#~ msgstr "Lag-tag med \"+\"-tegn" - -#~ msgid "street name contains ss" -#~ msgstr "vejnavn indeholder \"ss\"" #~ msgid "Layers: {0}" @@ -41415,7 +41835,4 @@ #~ "historiklisten." -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relations-editor: {0}" - #~ msgid "Login" #~ msgstr "Login" @@ -41554,7 +41971,4 @@ #~ msgstr "Hjælp / Om" -#~ msgid "maxspeed used for footway" -#~ msgstr "maks. hastighed angivet for gangsti" - #~ msgid "Edit Track of grade 1" #~ msgstr "Ret et spor af første niveau" @@ -41589,4 +42003,7 @@ #~ msgid "Edit Portcullis" #~ msgstr "Ret et faldgitter" + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)" #~ msgid "Merge Anyway" @@ -42188,7 +42605,4 @@ #~ msgstr "Kunne ikke opdatere de valgte primitiver." -#~ msgid "Open Aerial Map" -#~ msgstr "Hent luftkort" - #~ msgid "Conflicts in data" #~ msgstr "Konflikt i data" @@ -42307,16 +42721,4 @@ #~ msgid "Bikes" #~ msgstr "Cykler" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Unavngivet uklassificeret vej" #~ msgid "Use decimal degrees." @@ -42619,7 +43021,4 @@ #~ msgstr "UTM20 North Geodesic system" -#~ msgid "Sicily - Italy" -#~ msgstr "Sicilen - Italien" - #~ msgid "OpenLayers" #~ msgstr "OpenLayers" @@ -42654,19 +43053,4 @@ #~ msgid "standard" #~ msgstr "standard" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japan (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE kort (Tim)" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" #~ msgid "Communication with server failed" @@ -43040,4 +43424,7 @@ #~ msgstr "Download område" +#~ msgid "Click do download the currently selected area" +#~ msgstr "Klik for at downloade det nu markerede område" + #~ msgid "Download List" #~ msgstr "Download liste" @@ -43076,7 +43463,4 @@ #~ msgid "\"{0}\" is not closed and therefore can't be joined." #~ msgstr "\"{0}\" er ikke lukket og kan derfor ikke forenes." - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italien" #~ msgid " (configure changeset)" @@ -43415,4 +43799,12 @@ #~ msgstr "Den nuværende værdi er ikke en gyldig URL" +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Hverken {0} eller {1} er slået " +#~ "til.
Vælg venligst enten at downloade OSM-data, GPX-data eller begge " +#~ "dele." + #~ msgid "Enable built-in defaults" #~ msgstr "Slå indbyggede standarder til" @@ -43815,4 +44207,11 @@ #~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Børnerelationen
{0}
er slettet fra serveren. Den kan ikke " +#~ "hentes." + +#~ msgid "" #~ "You have sucessfully retrieved an OAuth Access Token from the OSM " #~ "website. Click on {0} to accept the token. JOSM will use " @@ -43826,8 +44225,2 @@ #~ msgid "C" #~ msgstr "C" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "cykelsti med tag cykel" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "adskilt cykelsti som spor på en cykelsti" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 25650) +++ /applications/editors/josm/i18n/po/de.po (revision 25651) @@ -8,6 +8,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-05 21:03+0000\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-19 22:22+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:16+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:14+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Hilfe" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoriere die ungültige Datei-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Warnung" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Der Parameter \"downloadgps\" unterstützt keine Dateinamen oder URLs." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoriere die ungültige URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -128,13 +128,13 @@ "Kompatible) Version des JOSM nutzen.Weitere Informationen:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "JOSM Verlassen" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Fortfahren, trotzdem versuchen" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -155,4 +155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -194,18 +195,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -224,4 +225,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Über" @@ -308,8 +311,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "WARNUNG: unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den " @@ -415,4 +418,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -499,5 +503,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -586,6 +590,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -628,51 +632,51 @@ msgstr "Bitte mindestens drei Knoten auswählen." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "Daten" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "Ebene" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "Auswahl" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "Konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "heruntergeladene Daten" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "vorheriger" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "nächster" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Nichts ausgewählt, auf das gezoomt werden kann." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Auf {0} zoomen" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Ansicht auf {0} zoomen." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -682,5 +686,5 @@ msgstr "Anzeige: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Keine Konflikte, auf die gezoomt werden kann" @@ -984,9 +988,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -995,5 +1000,5 @@ msgstr "Duplizieren" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Auswahl durch Kopieren und sofortiges Einfügen duplizieren." @@ -1101,5 +1106,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1478,5 +1483,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Ausgewählte Objekte mit einer anderen Ebene verbinden" @@ -1758,8 +1764,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Die kopierten Daten enthalten unvollständige Objekte. Möchten Sie fortfahren " @@ -1784,9 +1791,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "zu {0} Objekt" -msgstr[1] "zu {0} Objekten" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "{0} Objekt löschen" +msgstr[1] "{0} Objekte löschen" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1906,4 +1913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2869,5 +2877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2875,4 +2883,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3519,7 +3528,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3533,8 +3542,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "WARNUNG: Ebene ''{0}'' existiert nicht mehr. Der Konflikt für das Objekt " @@ -3752,9 +3761,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "{0} Objekt wiederherstellen" -msgstr[1] "{0} Objekte wiederherstellen" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "{0} Objekt löschen" +msgstr[1] "{0} Objekte löschen" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4080,5 +4089,5 @@ msgstr "Nicht im Zwischenspeicher" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4153,8 +4162,9 @@ "{1} nicht gefunden" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4319,5 +4329,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "Hintergrund" @@ -5037,5 +5047,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5049,4 +5059,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5557,6 +5568,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5674,5 +5685,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Hintergrund" @@ -5931,5 +5942,5 @@ msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5937,10 +5948,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Ansicht" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5948,5 +5959,5 @@ msgstr "Werkzeuge" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5954,5 +5965,5 @@ msgstr "Vorlagen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5963,5 +5974,5 @@ msgstr "Menü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6372,7 +6383,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" "Die folgenden Objekte konnten nicht ins Zielobjekt kopiert werden,
weil " @@ -6380,5 +6392,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Zusammenführen von gelöschten Objekten ist fehlgeschlagen" @@ -6656,8 +6669,10 @@ msgstr "Referenziert durch:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(nichts)" @@ -6697,5 +6712,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Objekt" @@ -6932,6 +6946,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6942,5 +6956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7155,5 +7169,4 @@ msgstr "Alle bisher ausgeführten (und zurücknehmbaren) Befehle anzeigen." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7164,5 +7177,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7170,7 +7183,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7202,13 +7216,13 @@ msgstr "Konflikte: {0} ungelöst" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7810,11 +7824,11 @@ msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autoren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "" @@ -7830,5 +7844,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Objekte auswählen, die dieser Nutzer eingetragen hat" @@ -7902,4 +7917,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Reparieren" @@ -8127,5 +8143,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Den Versionsverlauf der gewählten Objekte herunterladen und anzeigen" @@ -8166,5 +8183,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "In der aktuellen Ebene auf die zugehörigen Objekte zoomen" @@ -9303,6 +9321,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "In der aktuellen Ebene auf die Objekte dieses Änderungssatzes zoomen" @@ -9816,6 +9835,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Browser mit Wiki-Hilfe zum gewählten Objekt öffnen" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9868,8 +9887,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Die Kind-Relation
{0}
ist auf dem Server gelöscht. Sie kann " -"nicht geladen werden." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9960,8 +9977,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -9970,5 +9987,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Mehrere Elemente verweisen auf das gleiche Objekt" @@ -9985,6 +10003,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Alle ausgewählten Objekte im momentanen Datensatz vor dem ersten Element " @@ -9992,6 +10010,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Alle ausgewählten Objekte im momentanen Datensatz nach dem letzten Element " @@ -9999,6 +10017,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -10007,6 +10026,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -10015,5 +10035,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen" @@ -10025,13 +10046,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects 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:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Alle Elemente auswählen, die in den {0} Elementen der aktuellen Auswahl " @@ -10039,5 +10059,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Objekte für gewählte Relationselemente auswählen" @@ -10140,11 +10161,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"Ebene ''{0}'' enthält bereits einen Konflikt für das " -"Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" +"Ebene ''{0}'' hat bereits einen Konflikt für Objekt
''{1}''." +"
Bitte erst den Konflikt lösen und danach wieder versuchen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -10194,12 +10216,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Eine leere Rolle wird {0} Objekt zugewiesen." msgstr[1] "Eine leere Rolle wird {0} Objekten zugewiesen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Dies ist equivalent zum Löschen der Rollen für diese Objekte." @@ -10493,6 +10516,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Klicken, um den aktuellen Bereich zu laden" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10504,9 +10527,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Weder {0} noch {1} ist ausgewählt." -"
Bitte wählen Sie, ob sie OSM-Datenobjekte, GPS-Spuren oder beides laden " -"wollen." +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10589,4 +10609,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10673,5 +10694,6 @@ msgstr "JOSM-Hilfeanzeiger" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10679,19 +10701,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

Hilfe-Seite für ein Hilfe-Thema fehlt

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

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

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10706,5 +10720,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10715,19 +10729,19 @@ "
Vermutlich ist Ihre Internet-Verbindung unterbrochen." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Die URL konnte nicht geöffnet werden" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Aktuelle Hilfeseite in einem externen Browser öffnen" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Die aktuelle Hilfeseite bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10739,33 +10753,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Die aktuelle Hilfeseite neu laden" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Zur vorherigen Seite gehen" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Zur nächsten Seite gehen" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Gehe zur Start-Seite für die JOSM-Hilfe" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Warnung: Falsche Position im HTML-Dokument. Der Fehler war: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Die Hilfe-Seite konnte nicht geöffnet werden. Die Ziel-URL ist leer." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Die Hilfe-Seite konnte nicht geladen werden" @@ -10885,4 +10899,8 @@ msgid "Relation {0}" msgstr "Relation {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -11010,5 +11028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Konflikte gefunden" @@ -11719,8 +11737,9 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" "WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe " @@ -11728,5 +11747,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Objekte zum Hochladen vorbereiten..." @@ -11884,15 +11904,4 @@ msgstr "Änderungssatz ist voll" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe " -"dieses Objekt und fahre mit dem Hochladen fort." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11903,5 +11912,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -12110,4 +12119,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12189,5 +12199,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12413,24 +12423,24 @@ msgstr "FEHLER" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Datenebene {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "Außerhalb des heruntergeladenen Bereichs" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12439,11 +12449,11 @@ msgstr[1] "{0} Konflikte wurden entdeckt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12452,32 +12462,32 @@ msgstr[1] "{0} gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "nicht angegeben" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API-Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Zu GPX-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Datensatzkonsistenzprüfung" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Keine Probleme gefunden" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Folgende Probleme gefunden:" @@ -13234,6 +13244,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13263,7 +13273,7 @@ "Rechtsklick-Menü, um weitere Einzelheiten zu erfahren." -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13278,5 +13288,5 @@ msgstr "Ungültiges Strichelungsmuster - mindestens ein Wert muss positiv sein" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -14300,4 +14310,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Keine" @@ -14415,15 +14426,13 @@ msgstr "Schnelles Zeichnen (schlechtere Qualität)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Nur am Ende des Weges" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14587,15 +14596,20 @@ msgstr "GPS-Punkte" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Richtungspfeile für Wegabschnitte zeichnen." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Ordnungsnummer für alle Abschnitte innerhalb des Weges anzeigen." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -14604,10 +14618,10 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14616,9 +14630,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14628,5 +14642,5 @@ "anderen im ausgewählten Stil." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM-Daten" @@ -15992,4 +16006,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Prüfen" @@ -16669,7 +16684,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "Serverantwort Nummer 404, versuche Einzelanfragen für jedes Element" @@ -16723,9 +16739,9 @@ msgstr "Einstellung ''{0}'' fehlt. OsmApi-Initialisierung unmöglich." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Diese JOSM-Version ist mit dem eingestellten Server inkompatibel." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16736,10 +16752,10 @@ "die Versionen {0} bis {1} unterstützt werden." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." @@ -16748,11 +16764,11 @@ "wird." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16762,65 +16778,65 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Änderungssatz erstellen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Änderungssatz {0} erfolgreich geöffnet" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Nummer > 0 für den Änderungssatz erwartet. Wert {0} erhalten." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Änderungssatz aktualisieren..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Änderungssatz {0} aktualisieren..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Änderungssatz schließen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Hochladeanfrage vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Warte 10 Sekunden... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Starte Versuch {0} von {1} in {2} Sekunden..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - erneuter Versuch." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starte Wiederholung {0} von {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" "Der aktuelle Änderungsdatensatz ist ungültig. Kann keine Daten hochladen." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -16829,5 +16845,5 @@ "ist {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -18585,5 +18601,5 @@ msgstr "Fehler in Zeile " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "Fehlende Audiodatei" @@ -20650,5 +20666,5 @@ "Links-Klick: auf Knotenpunkt zum Auswählen/Abwählen; Ziehen: Wegstücke ziehen" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "Kontur zusammenführen" @@ -20907,4 +20923,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21137,9 +21154,9 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java:96 msgid "Channel-Digraph created from the active OSM-Layer" -msgstr "" +msgstr "Der Channel-Digraph wurde aus dem aktiven OSM-Layer erzeugt" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:42 msgid "Create Channel Digraph" -msgstr "" +msgstr "Channel-Digraph erzeugen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:68 @@ -21149,5 +21166,5 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:81 msgid "Converting OSM graph into Channel Digraph" -msgstr "" +msgstr "Wandle OSM-Daten in einen Channel-Digraphen um" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:110 @@ -21157,96 +21174,96 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:119 msgid "creating Channel-Digraph" -msgstr "" +msgstr "erzeuge Channel-Digraph" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:127 msgid "sealing Digraph" -msgstr "" +msgstr "versiegele Channel-Digraph" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:135 msgid "calculating Strong Connectedness" -msgstr "" +msgstr "berechne starke Zusammenhangskomponenten" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:139 msgid "creating DigraphLayer" -msgstr "" +msgstr "erzeuge Channel-Digraph-Layer" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47 msgid "JunctionChecking" -msgstr "" +msgstr "Kreuzungsüberprüfung" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47 msgid "Open the junctionchecking window." -msgstr "" +msgstr "Dialogfeld des Plugins anzeigen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 msgid "junctions" -msgstr "" +msgstr "Kreuzungen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:53 msgid "Channel-Digraph creation" -msgstr "" +msgstr "Channel-Digraph erzeugen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:54 msgid "seal Channel Digraph" -msgstr "" +msgstr "Channel-Digraph versiegeln" #. digraphPanel.add(digraphsealcb); #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:58 msgid "calculate strong connected channels" -msgstr "" +msgstr "berechne starke Zusammenhangskomponenten" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:64 msgid "Junctionchecking/junctions searching" -msgstr "" +msgstr "Kreuzungsüberprüfung/Kreuzungssuche" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:70 msgid "order of junction (n):" -msgstr "" +msgstr "Kreuzungsgrad" #. Elemente zur OSM-Relationen-Erzeugung #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:76 msgid "produce OSM-Relations: junction" -msgstr "" +msgstr "erzeuge OSM-Relationen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:77 msgid "" "if enabled the plugin produces osm-relations from the junction subgraphs" -msgstr "" +msgstr "erzeugt gültige OSM-Relationen aus gefundenen Kreuzungen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "Create" -msgstr "" +msgstr "Erzeugen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "start the channel digraph creation" -msgstr "" +msgstr "Startet die Erzeugung des Channel-Digraphen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:92 msgid "create the channel digraph" -msgstr "" +msgstr "erzeugt den Channel-Digraph" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94 msgid "Check " -msgstr "" +msgstr "Überprüfe " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94 msgid "check a marked subset if it is a junction" -msgstr "" +msgstr "überprüft eine markierte Teilmenge auf die Kreuzungskriterien" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:95 msgid "check the subust for junction properties" -msgstr "" +msgstr "überprüft eine markierte Teilmenge auf die Kreuzungskriterien" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 msgid "Search " -msgstr "" +msgstr "Suche " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 msgid "search for junctions into a subset of channels" -msgstr "" +msgstr "Sucht in einer Teilmenge von Channels nach Kreuzungen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:99 msgid "search for junctions in the channel subset" -msgstr "" +msgstr "Suche nach Kreuzungen in einer Teilmenge von Channels" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:55 @@ -21255,25 +21272,28 @@ "candidat mark these channel and press the \"Check\" button again." msgstr "" +"Die markierten Channels enthalten einen Kreuzungskandidaten (weiß " +"dargestellt). Zum Testen dieses Kandidaten die weißen Channels markieren und " +"den Erzeuge-Button erneut bestätigen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:59 #, java-format msgid "The marked channels are a {0}-ways junction" -msgstr "" +msgstr "Die markierten Channels sind eine {0}-Wege-Kreuzung" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:69 msgid "The marked channels are not a junction:" -msgstr "" +msgstr "Die markierten Channels stellen keine Kreuzung dar." #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java:44 msgid "construct channel digraph and search for junctions" -msgstr "" +msgstr "Erzeuge Channel-Digraph und suche nach Kreuzungen" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java:55 msgid "Number of {0]-ways junctions found: " -msgstr "" +msgstr "Anzahl der gefundenen {0}-Wege-Kreuzungen: " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java:83 msgid "generate all combinations from entrie/exit candidates" -msgstr "" +msgstr "Erzeuge alle Kombinationen aus Ein- und Ausgängen" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69 @@ -21614,5 +21634,5 @@ msgstr "Live GPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "MapDust öffnen" @@ -21722,4 +21742,8 @@ "enthalten." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21929,22 +21953,22 @@ msgstr "Firefox-Programm" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "Umwandlungsfehler: Min X muß kleiner als das Maximum sein." -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "Umwandlungsfehler: Min Y muß kleiner als das Maximum sein." -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "Umwandlungsfehler: Punkte zu nah" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Umwandlungsfehler: Variante nicht unterstützt" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Umwandlungsfehler: Seitenausrichtung wird nicht unterstützt" @@ -22583,4 +22607,14 @@ msgid "Waypoints" msgstr "Wegpunkte" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relationseditor: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23766,4 +23800,60 @@ msgstr "Einen neuen Signaturschlüssel erstellen" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23977,13 +24067,4 @@ "

Wollen Sie einen Konflikt erstellen und den Editor schließen?" -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." -msgstr "" -"Ebene ''{0}'' hat bereits einen Konflikt für Objekt
''{1}''." -"
Bitte erst den Konflikt lösen und danach wieder versuchen." - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -25613,4 +25694,7 @@ "junction or searches in a subset of channels for junctions" msgstr "" +"Erzeugt einen Channel-Digraphen und überprüft eine Teilmenge von Channels " +"auf die Kreuzungskritierien oder sucht in einer Teilmenge von Channels nach " +"Kreuzungen" #. Plugin lakewalker @@ -25649,6 +25733,11 @@ msgstr "Ein Gebiet einfach in ein Multipolygon umwandeln." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25661,15 +25750,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "erweiterte Optionen um Öffnungszeiten zu bearbeiten" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importiert Berichte von OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25679,5 +25768,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25686,10 +25775,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "PDF-Datei importieren und in Wege konvertieren." #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25700,5 +25789,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25709,15 +25798,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Das großartige Plastic-Design von JGoodies." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "Ergänzt Projektionen von Proj4J" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25727,20 +25816,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "Fügt "JOSM neustarten" in das Datei-Menü ein." #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Plugin zum Umkehren von Änderungssätzen" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "Bilder von rgis.spb.ru als Überlagerung nutzen" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -25754,5 +25843,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -25763,15 +25852,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Bietet Routenführungsmöglichkeiten." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "Erlaubt das Ausführen von Skripten in JOSM." #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25784,20 +25873,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "Erstellen und Ändern von Seekarten für OpenSeaMap" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25810,15 +25899,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Erstellt Reihenhäuser aus einem Häuserblock." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "Seezeichen für OpenSeaMap erstellen und bearbeiten" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25829,5 +25918,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25838,10 +25927,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "Plugin zum digitalen Signieren von OSM-Daten" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25852,15 +25947,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "Diverse Werkzeuge, die das Leben einfacher machen." #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25873,5 +25968,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25883,10 +25978,10 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" @@ -25894,10 +25989,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 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:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -41336,4 +41431,348 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "Abgekürzter Straßenname" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "Einbahnstraße auf einem Knoten" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "Brückenmerkmal auf einem Knoten" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "Falsches Straßenmerkmal auf einem Knoten" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Unbenannte klassenlose Straße" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "Straße ohne Referenznummer" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "Temporärer Straßentyp" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "Falschgeschriebener Schlüssel: name" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "Radweg mit bicycle-Merkmal" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "Fußweg mit foot-Merkmal" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "Radweg als Spur eines Radweges" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "Barriere auf einen Weg" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "Höchstgeschwindigkeit auf einem Fußweg" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "Ebenenschlüssel mit + Symbol" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "Straßenname enthält ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "Relation ohne Typ" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "Restaurant ohne Namen" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "Ungewöhnliche Schlüssel/Wert-Kombinationen" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "LandSat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (Spiegelserver)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "OpenAerial-Karte" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Straßen NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Tschechien CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Tschechien UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE-Karten" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE-Karten (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7. Serie (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi (Lauden) - Italien" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sizilien - Italien" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - Italy" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps (Frankreich)" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "PNOA-Spanien" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "Estland Basiskarte (Maaamet)" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "Estland Luftbild (Maaamet)" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "Estland Multi (Maaamet)" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "Fugro (Dänemark)" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "zu {0} Objekt" +#~ msgstr[1] "zu {0} Objekten" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "{0} Objekt wiederherstellen" +#~ msgstr[1] "{0} Objekte wiederherstellen" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Ebene ''{0}'' enthält bereits einen Konflikt für das " +#~ "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. " +#~ "Überspringe dieses Objekt und fahre mit dem Hochladen fort." + #~ msgid "Move" #~ msgstr "Verschieben" @@ -41368,7 +41807,4 @@ #~ msgid " ({0} deleted.)" #~ msgstr " ({0} gelöscht.)" - -#~ msgid "Object" -#~ msgstr "Objekt" #~ msgid "unnamed" @@ -41850,25 +42286,4 @@ #~ msgstr "Einrichtungen" -#~ msgid "highway without a reference" -#~ msgstr "Straße ohne Referenznummer" - -#~ msgid "temporary highway type" -#~ msgstr "Temporärer Straßentyp" - -#~ msgid "misspelled key name" -#~ msgstr "Falschgeschriebener Schlüssel: name" - -#~ msgid "barrier used on a way" -#~ msgstr "Barriere auf einen Weg" - -#~ msgid "maxspeed used for footway" -#~ msgstr "Höchstgeschwindigkeit auf einem Fußweg" - -#~ msgid "street name contains ss" -#~ msgstr "Straßenname enthält ss" - -#~ msgid "abbreviated street name" -#~ msgstr "Abgekürzter Straßenname" - #~ msgid "Please enter a search string" #~ msgstr "Bitte einen Suchbegriff eingeben" @@ -41942,10 +42357,4 @@ #~ msgid "Download WMS tile from {0}" #~ msgstr "Lade WMS-Ebene aus Datei {0}" - -#~ msgid "Landsat" -#~ msgstr "LandSat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE-Karten" #~ msgid "WMS" @@ -42063,7 +42472,4 @@ #~ msgstr "Benutzungsgebühr" -#~ msgid "Open Aerial Map" -#~ msgstr "OpenAerial-Karte" - #~ msgid "YAHOO (GNOME)" #~ msgstr "Yahoo (GNOME)" @@ -42123,19 +42529,4 @@ #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Merkmale (leerer Wert löscht das Merkmal)" - -#~ msgid "bridge tag on a node" -#~ msgstr "Brückenmerkmal auf einem Knoten" - -#~ msgid "oneway tag on a node" -#~ msgstr "Einbahnstraße auf einem Knoten" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "Radweg mit bicycle-Merkmal" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "Falsches Straßenmerkmal auf einem Knoten" - -#~ msgid "footway with tag foot" -#~ msgstr "Fußweg mit foot-Merkmal" #~ msgid "Unknown version" @@ -42491,7 +42882,4 @@ #~ msgstr "Aktuelle Auswahl oder den kompletten Datensatz prüfen." -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "Radweg als Spur eines Radweges" - #~ msgid "NullPointerException, possibly some missing tags." #~ msgstr "NullPointerException, vielleicht fehlende Merkmale." @@ -42547,7 +42935,4 @@ #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" #~ msgstr "Berichtigtes Bild von Metacartas-WMS-Kartenkorrektur herunterladen" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Straßen NRW Geofabrik.de" #~ msgid "Portcullis" @@ -42694,13 +43079,4 @@ #~ msgstr "Dies funktioniert nicht mit anonymen Nutzern" -#~ msgid "relation without type" -#~ msgstr "Relation ohne Typ" - -#~ msgid "restaurant without name" -#~ msgstr "Restaurant ohne Namen" - -#~ msgid "unusual tag combination" -#~ msgstr "Ungewöhnliche Schlüssel/Wert-Kombinationen" - #~ msgid "" #~ "The plugin {0} seems to be broken or could not be downloaded " @@ -42796,7 +43172,4 @@ #~ msgstr "" #~ "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen." - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE-Karten (Tim)" #~ msgid "More than one \"from\" way found." @@ -43058,7 +43431,4 @@ #~ msgstr "Nach unten" -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relationseditor: {0}" - #~ msgid "Solve Conflict" #~ msgstr "Konflikte lösen" @@ -43812,4 +44182,7 @@ #~ msgid "preference {0} missing. Can't initialize OsmApi" #~ msgstr "Einstellung {0} fehlt. Kann OsmApi nicht initialisieren." + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)" #~ msgid "" @@ -44332,13 +44705,4 @@ #~ msgstr "Es gibt ungespeicherte Daten. Änderungen verwerfen und fortfahren?" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - #~ msgid "" #~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" @@ -44373,7 +44737,4 @@ #~ msgid "Used style" #~ msgstr "Benutzter Stil" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" #~ msgid "Change {0} {1}" @@ -44444,7 +44805,4 @@ #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" #~ msgstr "Syntaxfehler im Muster: Muster {0} in {1} ist ungültig!" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Unbenannte klassenlose Straße" #~ msgid "not visible (on the server)" @@ -45085,10 +45443,4 @@ #~ msgid "Illegal upload comment" #~ msgstr "Ungültiger Kommentar" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Tschechien UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Tschechien CUZK:KM" #~ msgid "create new objects" @@ -46051,4 +46403,12 @@ #~ msgstr "Verfügbare Stile (von {0})" +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Weder {0} noch {1} ist ausgewählt." +#~ "
Bitte wählen Sie, ob sie OSM-Datenobjekte, GPS-Spuren oder beides " +#~ "laden wollen." + #~ msgid "{0} Plugin successfully downloaded." #~ msgid_plural "{0} Plugins successfully downloaded." @@ -46186,25 +46546,4 @@ #~ msgid "Downloading relation ''{0}''" #~ msgstr "Relation ''{0}'' herunterladen" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7. Serie (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japan (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi (Lauden) - Italien" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sizilien - Italien" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japan (ORTHO03)" #~ msgid "Could not create a node with the entered latitude/longitude." @@ -46703,7 +47042,4 @@ #~ msgstr "" #~ "{0} von {1} Bildern an GPS-Spur angepaßt." - -#~ msgid "layer tag with + sign" -#~ msgstr "Ebenenschlüssel mit + Symbol" #~ msgid "" @@ -47223,4 +47559,11 @@ #~ "werden
und die auf dem Server gelöscht sind.

Sollen diese " #~ "Objekte auch wiederhergestellt werden?" + +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Die Kind-Relation
{0}
ist auf dem Server gelöscht. Sie kann " +#~ "nicht geladen werden." #~ msgid "GPS point" @@ -47291,4 +47634,25 @@ #~ msgid "Authenticationi failed" #~ msgstr "Authentifizierung fehlgeschlagen" + +#~ msgid "Click do download the currently selected area" +#~ msgstr "Klicken, um den aktuellen Bereich zu laden" + +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

Hilfe-Seite für ein Hilfe-Thema fehlt

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

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

" #~ msgid "" @@ -47702,7 +48066,4 @@ #~ msgstr "SeaMap-Symbole bearbeiten" -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (Spiegelserver)" - #~ msgid "" #~ "Remote Control has been asked to load a WMS layer from the following URL:" @@ -47724,7 +48085,4 @@ #~ msgid "jump" #~ msgstr "Anspringen" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - Italy" #~ msgid "Internal style" @@ -47789,4 +48147,7 @@ #~ msgstr "Serverfähigkeiten auslesen" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Browser mit Wiki-Hilfe zum gewählten Objekt öffnen" + #~ msgid "Plugin for Seamap Editor" #~ msgstr "Plugin für Seekarteneditor" @@ -47800,7 +48161,4 @@ #~ msgid "Seamap Editor" #~ msgstr "Seekarten Editor" - -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps (Frankreich)" #~ msgid "Phone" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 25650) +++ /applications/editors/josm/i18n/po/el.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-02-16 07:54+0000\n" "Last-Translator: alichani \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:31+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:35+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Βοήθεια" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Προειδοποίηση" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Η παράμετρος \"downloadgps\" δεν δέχεται ονόματα ή URL αρχείων" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -125,13 +125,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Έξοδος από το JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -152,4 +152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -191,18 +192,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -221,4 +222,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Περί" @@ -308,5 +311,5 @@ msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" @@ -404,4 +407,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -485,5 +489,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -572,6 +576,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -614,51 +618,51 @@ msgstr "Παρακαλώ επιλέξτε τουλάχιστον τρείς κόμβους." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "δεδομένα" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "επίπεδο" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "σύγκρουση" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "λήψη" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "προηγούμενο" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "επόμενο" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Ζουμ στο {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Ζουμ στο {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -668,5 +672,5 @@ msgstr "Προβολή: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Καμοία διένεξη για να γίνει ζουμ" @@ -969,9 +973,11 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "" +"Άνοιγμα λίστας των ατόμων που εργάζονται πάνω στα επιλεγμένα αντικείμενα." + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -980,5 +986,5 @@ msgstr "Αντιγραφή" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Αντιγραφή επιλογής με αντιγραφή και άμεση επικόλληση." @@ -1087,5 +1093,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1443,6 +1449,7 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" -msgstr "" +#, fuzzy +msgid "Merge the currently selected objects into another layer" +msgstr "Συγχώνευση τρέχοντως επιπέδου σε άλλο επίπεδο" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1710,7 +1717,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1733,9 +1740,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Διαγραφή {0} αντικειμένου" +msgstr[1] "Διαγραφή {0} αντικειμένων" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1848,4 +1855,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2773,5 +2781,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2779,4 +2787,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3376,5 +3385,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3389,5 +3398,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3595,9 +3604,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Διαγραφή {0} αντικειμένου" +msgstr[1] "Διαγραφή {0} αντικειμένων" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3893,5 +3902,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3949,8 +3958,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4104,5 +4114,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "φόντο" @@ -4803,5 +4813,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4815,4 +4825,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5308,6 +5319,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5425,5 +5436,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5666,5 +5677,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5672,10 +5683,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Προβολή" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5683,5 +5694,5 @@ msgstr "Εργαλεία" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5689,5 +5700,5 @@ msgstr "Προεπιλογές" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5698,5 +5709,5 @@ msgstr "Μενού: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Ήχος" @@ -6084,10 +6095,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +msgid "Merging deleted objects failed" msgstr "" @@ -6345,8 +6356,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(κανένα)" @@ -6386,5 +6399,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6618,6 +6630,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6628,5 +6640,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6811,5 +6823,4 @@ msgstr "Άνοιγμα λίστας όλων των εντολών (μνήμη αναίρεσης)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6820,5 +6831,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6826,7 +6837,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6857,9 +6869,9 @@ msgstr "Διενέξεις: {0} δεν επιλύθηκαν" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Επίλυση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -6867,5 +6879,5 @@ "λίστα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7440,11 +7452,11 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Συγγραφείς" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "" @@ -7459,5 +7471,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7525,4 +7537,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Διόρθωση" @@ -7744,6 +7757,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "Εμφάνιση του ιστορικού όλων των επιλεγμένων αντικειμένων." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7779,6 +7793,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "" +"Δεν βρέθηκε κάποιο αντικείμενο με αναγνωριστικό {0} στην ισχύουσα ομάδα " +"δεδομένων" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 @@ -8911,5 +8928,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9382,5 +9399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9434,5 +9451,5 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9522,10 +9539,10 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9539,28 +9556,31 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "Αποστολή όλων των αλλαγών από το τρέχον επίπεδο στον διακομιστή OSM" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "Αποστολή όλων των αλλαγών από το τρέχον επίπεδο στον διακομιστή OSM" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" -msgstr "" +msgstr "Αποστολή όλων των αλλαγών από το τρέχον επίπεδο στον διακομιστή OSM" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "" +"Άνοιγμα λίστας των ατόμων που εργάζονται πάνω στα επιλεγμένα αντικείμενα." #. putValue(NAME, tr("Remove Selected")); @@ -9571,6 +9591,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9578,11 +9597,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Διαγραφή της επιλεγμένης σχέσης" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9674,8 +9693,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9727,11 +9747,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -10012,5 +10032,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -10023,5 +10043,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10105,4 +10125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10187,5 +10208,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10193,11 +10215,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10208,5 +10230,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10215,19 +10237,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10237,33 +10259,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10375,4 +10397,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Αντικείμενο" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10485,5 +10511,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Εντοπίστηκαν διενέξεις" @@ -11119,13 +11145,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Προετοιμασία επιπέδου \"{0}\" για αποστολή ..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11256,13 +11284,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11271,5 +11290,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11462,4 +11481,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11541,5 +11561,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11754,23 +11774,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Επίπεδο Δεδομένων {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "εκτός περιοχής λήψης" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "έκδοση {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11779,11 +11799,11 @@ msgstr[1] "Εντοπίστηκαν {0} διενέξεις" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11792,32 +11812,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Έκδοση API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Μετατροπή σε επίπεδο GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12538,6 +12558,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12561,7 +12581,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12576,5 +12596,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13474,4 +13494,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Κανένα" @@ -13588,14 +13609,12 @@ msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" - -#. only on the head of a way +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 +msgid "Only on the head of a way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 -msgid "Only on the head of a way." +msgid "Draw oneway arrows." msgstr "" @@ -13745,15 +13764,20 @@ msgstr "Σημεία GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -13761,19 +13785,19 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13781,5 +13805,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Δεδομένα OSM" @@ -15026,4 +15050,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Επαλήθευση" @@ -15657,5 +15682,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15709,9 +15734,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15720,21 +15745,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15742,69 +15767,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Με επιτυχία άνοιξε το changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Κλείσιμο πακέτου αλλαγών" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17350,5 +17375,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19253,5 +19278,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19506,4 +19531,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20203,5 +20229,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20305,4 +20331,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20499,22 +20529,22 @@ msgstr "εκτελέσιμο Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21148,4 +21178,14 @@ msgid "Waypoints" msgstr "Σημεία αναφοράς" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Επεξεργαστής Σχέσεων: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22283,4 +22323,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22470,11 +22566,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24011,6 +24100,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24020,15 +24114,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Εισάγει προβλήματα από OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24036,5 +24130,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24042,10 +24136,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24054,5 +24148,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24061,15 +24155,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24077,20 +24171,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24100,5 +24194,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24107,15 +24201,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Παρέχει δυνατότητες δρομολόγησης." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24125,20 +24219,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24148,15 +24242,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24165,5 +24259,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24172,10 +24266,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24184,15 +24284,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24202,5 +24302,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24212,20 +24312,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39647,4 +39747,323 @@ msgstr "Δοκιμή" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "Συντμημένο όνομα οδού" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "ετικέτα μονόδρομου σε κόμβο" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "ετικέτα γέφυρας σε κόμβο" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "λάθος ετικέτα αυτοκινητοδρόμου σε κόμβο" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "ετικέτα επιπέδου με σήμα +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "σχέση χωρίς τύπο" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "εστιατόριο χωρίς όνομα" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "ασυνήθηστος συνδυασμός ετικετών" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Άνοιγμα Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Streets NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "Χάρτες NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "Χάρτες NPE (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Do not show again" #~ msgstr "Να μην εμφανιστεί ξανά" @@ -40233,7 +40652,4 @@ #~ "που έχει απιλεγεί στη λίστα ιστορικού." -#~ msgid "Object" -#~ msgstr "Αντικείμενο" - #~ msgid "their version:" #~ msgstr "η έκδοση τους:" @@ -40562,10 +40978,4 @@ #~ msgstr "YAHOO (GNOME)" -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "Χάρτες NPE" - #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "YAHOO (GNOME Fix)" @@ -40579,7 +40989,4 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Streets NRW Geofabrik.de" #~ msgid "" @@ -40588,19 +40995,4 @@ #~ "Aδύνατη η σύνδεση με τον OSM server.Παρακαλω ελέγξτε την σύνδεση σας στο " #~ "Internet." - -#~ msgid "bridge tag on a node" -#~ msgstr "ετικέτα γέφυρας σε κόμβο" - -#~ msgid "oneway tag on a node" -#~ msgstr "ετικέτα μονόδρομου σε κόμβο" - -#~ msgid "abbreviated street name" -#~ msgstr "Συντμημένο όνομα οδού" - -#~ msgid "relation without type" -#~ msgstr "σχέση χωρίς τύπο" - -#~ msgid "restaurant without name" -#~ msgstr "εστιατόριο χωρίς όνομα" #~ msgid "Boat" @@ -40838,7 +41230,4 @@ #~ msgstr "Διαγραφή Επιπέδου" -#~ msgid "Relation Editor: {0}" -#~ msgstr "Επεξεργαστής Σχέσεων: {0}" - #~ msgid "GPS unit timezone (difference to photo)" #~ msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" @@ -40930,10 +41319,4 @@ #~ msgstr "Παρακαλώ αναφέρετε ένα δελτίο στο {0}" -#~ msgid "Open Aerial Map" -#~ msgstr "Άνοιγμα Aerial Map" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "Χάρτες NPE (Tim)" - #~ msgid "intermedia" #~ msgstr "μεσαία" @@ -40968,10 +41351,4 @@ #~ msgid "Edit Mountain Hiking" #~ msgstr "Επεξεργασία Ορειβασίας" - -#~ msgid "layer tag with + sign" -#~ msgstr "ετικέτα επιπέδου με σήμα +" - -#~ msgid "unusual tag combination" -#~ msgstr "ασυνήθηστος συνδυασμός ετικετών" #~ msgid "Help / About" @@ -41231,21 +41608,6 @@ #~ msgstr "Επιλέξτε αν τα δεδομένα πρέπει να ληφθούν σε νέο επίπεδο" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - #~ msgid "Update selections" #~ msgstr "Ενημέρωση επιλογών" - -#~ msgid "Upload all changes in the current data layer to the OSM server" -#~ msgstr "Αποστολή όλων των αλλαγών από το τρέχον επίπεδο στον διακομιστή OSM" #~ msgid "Uploading failed.
{0}" @@ -41275,7 +41637,4 @@ #~ msgstr "Δημιουργία καινούργιου χάρτη" -#~ msgid "wrong highway tag on a node" -#~ msgstr "λάθος ετικέτα αυτοκινητοδρόμου σε κόμβο" - #~ msgid "More than one \"to\" way found." #~ msgstr "Βρέθηκαν περισότερες απο μία διαδρομή \"προς\"" Index: /applications/editors/josm/i18n/po/en_AU.po =================================================================== --- /applications/editors/josm/i18n/po/en_AU.po (revision 25650) +++ /applications/editors/josm/i18n/po/en_AU.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2010-11-27 03:23+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:31+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:35+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoring malformed file URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Warning" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" does not accept file names or file URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -125,13 +125,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/Main.java:759 +msgid "Exit JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:760 +msgid "Continue, try anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:761 -msgid "Exit JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:762 -msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -152,4 +152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -191,18 +192,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -221,4 +222,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "About" @@ -305,8 +308,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "WARNING: unexpected format of API base URL. Redirection to info or history " @@ -410,4 +413,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -492,5 +496,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -579,6 +583,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -621,51 +625,51 @@ msgstr "Please select at least three nodes." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "layer" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "selection" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "download" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "previous" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "next" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Nothing selected to zoom to." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Zoom to {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Zoom the view to {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -675,5 +679,5 @@ msgstr "View: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "No conflicts to zoom to" @@ -977,9 +981,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Download primitives referring to one of the selected primitives" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -988,5 +993,5 @@ msgstr "Duplicate" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicate selection by copy and immediate paste." @@ -1094,5 +1099,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1450,5 +1455,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Merge the currently selected primitives into another layer" @@ -1726,8 +1732,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1753,9 +1760,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "to {0} primitive" -msgstr[1] "to {0} primtives" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Delete {0} object" +msgstr[1] "Delete {0} objects" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1868,4 +1875,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2804,5 +2812,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2810,4 +2818,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3426,7 +3435,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3440,8 +3449,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " @@ -3654,9 +3663,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Undelete {0} primitive" -msgstr[1] "Undelete {0} primitives" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Delete {0} object" +msgstr[1] "Delete {0} objects" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3972,5 +3981,5 @@ msgstr "Not in cache" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4032,8 +4041,9 @@ msgstr "Missing merge target of type {0} with id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4194,5 +4204,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "background" @@ -4904,5 +4914,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4916,4 +4926,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5413,6 +5424,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5530,5 +5541,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5779,5 +5790,5 @@ msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5785,10 +5796,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5796,5 +5807,5 @@ msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5802,5 +5813,5 @@ msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5811,5 +5822,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6214,13 +6225,15 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" +msgstr "" "The following primitives could not be copied to the target " "primitive
because they are deleted in the target dataset:" -msgstr "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Merging deleted primitives failed" @@ -6493,8 +6506,10 @@ msgstr "Referenced by:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(none)" @@ -6534,5 +6549,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitive" @@ -6766,6 +6780,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6776,5 +6790,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6977,5 +6991,4 @@ msgstr "Open a list of all commands (undo buffer)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6986,5 +6999,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6992,7 +7005,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7023,13 +7037,13 @@ msgstr "Conflicts: {0} unresolved" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Resolve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Open a merge dialogue of all selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7609,11 +7623,11 @@ msgstr "Click to minimise/maximise the panel content" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Authors" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Open a list of people working on the selected objects." @@ -7627,5 +7641,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Select primitives submitted by this user" @@ -7696,4 +7711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Fix" @@ -7918,5 +7934,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Download and show the history of the selected primitives" @@ -7957,5 +7974,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Zoom to the corresponding primitives in the current data layer" @@ -9092,6 +9110,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9592,5 +9611,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9644,8 +9663,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9734,16 +9751,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format -msgid "" +#, fuzzy, java-format +msgid "" +"This relation already has one or more members referring to
the " +"object ''{0}''

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

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

Do you really want to add another relation member?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Multiple members referring to same primitive" @@ -9760,33 +9778,36 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "" "Add all primitives selected in the current dataset before the first member" -msgstr "" -"Add all primitives selected in the current dataset before the first member" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "" "Add all primitives selected in the current dataset after the last member" -msgstr "" -"Add all primitives selected in the current dataset after the last member" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " +"member" +msgstr "" "Add all primitives selected in the current dataset before the first selected " "member" -msgstr "" -"Add all primitives selected in the current dataset before the first selected " + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" +msgstr "" "Add all primitives selected in the current dataset after the last selected " "member" -msgstr "" -"Add all primitives selected in the current dataset after the last selected " -"member" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Remove all members referring to one of the selected primitives" @@ -9798,20 +9819,20 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" +msgstr "" "Select relation members which refer to primitives in the current selection" -msgstr "" -"Select relation members which refer to primitives in the current selection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" +msgstr "" "Select relation members which refer to {0} primitives in the current " "selection" -msgstr "" -"Select relation members which refer to {0} primitives in the current " -"selection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Select primitives for selected relation members" @@ -9910,11 +9931,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -9964,12 +9984,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "You are setting an empty role on {0} primitive." msgstr[1] "You are setting an empty role on {0} primitives." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "This is equal to deleting the roles of these primitives." @@ -10253,6 +10274,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Click do download the currently selected area" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10264,8 +10285,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10348,4 +10367,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10430,5 +10450,6 @@ msgstr "JOSM Help Browser" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10436,18 +10457,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

Help content for help topic missing

Help content for the help topic {0} " -"is not available yet. It is missing both in your local language ({1}) and in " -"english.

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

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10462,5 +10476,5 @@ "p>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10471,19 +10485,19 @@ "network problem, please check
your internet connection" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Failed to open URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Open the current help page in an external browser" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Edit the current help page" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10495,33 +10509,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Reload the current help page" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Go to the previous page" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Go to the next page" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Go to the JOSM help home page" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Warning: bad location in HTML document. Exception was: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Failed to open help page. The target URL is empty." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Failed to open help page" @@ -10635,4 +10649,9 @@ msgid "Relation {0}" msgstr "Relation {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +#, fuzzy +msgid "Object" +msgstr "object" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10757,5 +10776,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Conflicts detected" @@ -11437,14 +11456,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Preparing primitives to upload ..." @@ -11598,15 +11619,4 @@ msgstr "Changeset is full" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11615,5 +11625,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11817,4 +11827,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11896,5 +11907,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12118,23 +12129,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12143,11 +12154,11 @@ msgstr[1] "There were {0} conflicts detected." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Click to close this dialogue and continue editing" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12156,32 +12167,32 @@ msgstr[1] "{0} deleted" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Dataset consistency test" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "No problems found" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Following problems found:" @@ -12927,6 +12938,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12951,7 +12962,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12966,5 +12977,5 @@ msgstr "Illegal dash pattern, at least one value must be > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13950,4 +13961,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "None" @@ -14064,15 +14076,13 @@ msgstr "Fast drawing (looks uglier)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Only interesting direction hints (e.g. with oneway tag)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Only on the head of a way." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14232,34 +14242,39 @@ msgstr "GPS Points" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Draw direction hints for way segments." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Draw the order numbers of all segments within their way." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Apply antialiasing to the map view resulting in a smoother appearance." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Draw the boundaries of data loaded from the server." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Draw virtual nodes in select mode for easy way modification." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Draw the inactive data layers in a different colour." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14267,5 +14282,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM Data" @@ -15576,4 +15591,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Validate" @@ -16235,7 +16251,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Server replied with response code 404, retrying with an individual request " @@ -16291,9 +16308,9 @@ msgstr "Preference ''{0}'' missing. Cannot initialise OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "This version of JOSM is incompatible with the configured server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16304,21 +16321,21 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Communications with {0} established using protocol version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "unexpected format of id replied by the server, got ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16327,69 +16344,69 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Creating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Successfully opened changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Changeset ID > 0 expected. Got {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Updating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Updating changeset {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Preparing upload request..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Starting retry {0} of {1} in {2} seconds ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - trying again." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starting retry {0} of {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Current changeset is null. Cannot upload data." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID of current changeset > 0 required. Current ID is {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -18089,5 +18106,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -20040,5 +20057,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -20293,4 +20310,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20988,5 +21006,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -21090,4 +21108,8 @@ msgstr "One of the selected ways is already part of another multipolygon." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21290,22 +21312,22 @@ msgstr "Firefox executable" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21940,4 +21962,14 @@ msgid "Waypoints" msgstr "Waypoints" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relation Editor: Sort" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23076,4 +23108,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23263,11 +23351,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24837,6 +24918,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24849,15 +24935,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Imports issues from OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24866,5 +24952,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24873,10 +24959,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24887,5 +24973,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24896,15 +24982,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "The great JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24913,20 +24999,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24936,5 +25022,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24945,15 +25031,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24963,20 +25049,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24989,15 +25075,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25006,5 +25092,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25015,10 +25101,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25027,15 +25119,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25045,5 +25137,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25054,20 +25146,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40491,4 +40583,347 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "abbreviated street name" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "oneway tag on a node" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "bridge tag on a node" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "wrong highway tag on a node" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Unnamed unclassified highway" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "highway without a reference" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "temporary highway type" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "misspelt key name" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "cycleway with tag bicycle" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "footway with tag foot" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "separate cycleway as lane on a cycleway" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "barrier used on a way" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "maxspeed used for footway" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "layer tag with + sign" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "street name contains ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relation without type" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurant without name" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "unusual tag combination" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Streets NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italy" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicily - Italy" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "to {0} primitive" +#~ msgstr[1] "to {0} primtives" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Undelete {0} primitive" +#~ msgstr[1] "Undelete {0} primitives" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." + #~ msgid "There are unsaved changes. Discard the changes and continue?" #~ msgstr "There are unsaved changes. Discard the changes and continue?" @@ -40919,4 +41354,38 @@ #~ msgid "Apply also for children" #~ msgstr "Apply also for children" + +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" + +#~ msgid "Click do download the currently selected area" +#~ msgstr "Click do download the currently selected area" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." + +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" #~ msgid "Enter an upload comment (min. 3 characters)" @@ -40985,4 +41454,7 @@ #~ msgstr "Create non-audio markers when reading GPX." +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Only interesting direction hints (e.g. with oneway tag)." + #~ msgid "Enable built-in defaults" #~ msgstr "Enable built-in defaults" @@ -41345,79 +41817,4 @@ #~ msgstr "Amenities" -#~ msgid "abbreviated street name" -#~ msgstr "abbreviated street name" - -#~ msgid "oneway tag on a node" -#~ msgstr "oneway tag on a node" - -#~ msgid "bridge tag on a node" -#~ msgstr "bridge tag on a node" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "wrong highway tag on a node" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Unnamed unclassified highway" - -#~ msgid "highway without a reference" -#~ msgstr "highway without a reference" - -#~ msgid "temporary highway type" -#~ msgstr "temporary highway type" - -#~ msgid "misspelled key name" -#~ msgstr "misspelt key name" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "cycleway with tag bicycle" - -#~ msgid "footway with tag foot" -#~ msgstr "footway with tag foot" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "separate cycleway as lane on a cycleway" - -#~ msgid "barrier used on a way" -#~ msgstr "barrier used on a way" - -#~ msgid "maxspeed used for footway" -#~ msgstr "maxspeed used for footway" - -#~ msgid "layer tag with + sign" -#~ msgstr "layer tag with + sign" - -#~ msgid "street name contains ss" -#~ msgstr "street name contains ss" - -#~ msgid "relation without type" -#~ msgstr "relation without type" - -#~ msgid "restaurant without name" -#~ msgstr "restaurant without name" - -#~ msgid "unusual tag combination" -#~ msgstr "unusual tag combination" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Streets NRW Geofabrik.de" - #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" @@ -41425,35 +41822,2 @@ #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Maps" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Maps (Tim)" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japan (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japan (ORTHO03)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italy" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicily - Italy" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 25650) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 25651) @@ -11,5 +11,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2010-12-16 01:17+0000\n" "Last-Translator: bastik \n" @@ -19,15 +19,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:13+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:13+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -37,12 +37,12 @@ msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoring malformed file URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -78,7 +78,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -111,14 +111,14 @@ msgstr "Warning" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" does not accept file names or file URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoring malformed URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -128,13 +128,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/Main.java:759 +msgid "Exit JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:760 +msgid "Continue, try anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:761 -msgid "Exit JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:762 -msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -155,4 +155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -194,18 +195,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -224,4 +225,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "About" @@ -308,8 +311,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "WARNING: unexpected format of API base URL. Redirection to info or history " @@ -413,4 +416,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -495,5 +499,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -582,6 +586,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -624,51 +628,51 @@ msgstr "Please select at least three nodes." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "layer" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "selection" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "download" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "previous" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "next" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Nothing selected to zoom to." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Zoom to {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Zoom the view to {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -678,5 +682,5 @@ msgstr "View: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "No conflicts to zoom to" @@ -980,9 +984,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Download primitives referring to one of the selected primitives" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -991,5 +996,5 @@ msgstr "Duplicate" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicate selection by copy and immediate paste." @@ -1097,5 +1102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1453,5 +1458,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Merge the currently selected primitives into another layer" @@ -1729,8 +1735,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "The copied data contains incomplete primitives. When pasting the incomplete " @@ -1756,9 +1763,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "to {0} primitive" -msgstr[1] "to {0} primtives" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Delete {0} object" +msgstr[1] "Delete {0} objects" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1871,4 +1878,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2807,5 +2815,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2813,4 +2821,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3429,7 +3438,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3443,8 +3452,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " @@ -3657,9 +3666,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Undelete {0} primitive" -msgstr[1] "Undelete {0} primitives" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Delete {0} object" +msgstr[1] "Delete {0} objects" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3975,5 +3984,5 @@ msgstr "Not in cache" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4035,8 +4044,9 @@ msgstr "Missing merge target of type {0} with id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4197,5 +4207,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "background" @@ -4907,5 +4917,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4919,4 +4929,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5416,6 +5427,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5533,5 +5544,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5782,5 +5793,5 @@ msgstr "Preference setting {0} has been removed since it is no longer used." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5788,10 +5799,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "View" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5799,5 +5810,5 @@ msgstr "Tools" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5805,5 +5816,5 @@ msgstr "Presets" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5814,5 +5825,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6217,13 +6228,15 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" +msgstr "" "The following primitives could not be copied to the target " "primitive
because they are deleted in the target dataset:" -msgstr "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Merging deleted primitives failed" @@ -6496,8 +6509,10 @@ msgstr "Referenced by:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(none)" @@ -6537,5 +6552,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitive" @@ -6769,6 +6783,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6779,5 +6793,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6980,5 +6994,4 @@ msgstr "Open a list of all commands (undo buffer)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6989,5 +7002,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6995,7 +7008,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7026,13 +7040,13 @@ msgstr "Conflicts: {0} unresolved" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Resolve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Open a merge dialogue of all selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7612,11 +7626,11 @@ msgstr "Click to minimise/maximise the panel content" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Authors" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Open a list of people working on the selected objects." @@ -7630,5 +7644,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Select primitives submitted by this user" @@ -7699,4 +7714,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Fix" @@ -7921,5 +7937,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Download and show the history of the selected primitives" @@ -7960,5 +7977,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Zoom to the corresponding primitives in the current data layer" @@ -9095,6 +9113,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9603,5 +9622,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9655,8 +9674,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9745,16 +9762,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format -msgid "" +#, fuzzy, java-format +msgid "" +"This relation already has one or more members referring to
the " +"object ''{0}''

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

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

Do you really want to add another relation member?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Multiple members referring to same primitive" @@ -9771,33 +9789,36 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "" "Add all primitives selected in the current dataset before the first member" -msgstr "" -"Add all primitives selected in the current dataset before the first member" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "" "Add all primitives selected in the current dataset after the last member" -msgstr "" -"Add all primitives selected in the current dataset after the last member" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " +"member" +msgstr "" "Add all primitives selected in the current dataset before the first selected " "member" -msgstr "" -"Add all primitives selected in the current dataset before the first selected " + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" +msgstr "" "Add all primitives selected in the current dataset after the last selected " "member" -msgstr "" -"Add all primitives selected in the current dataset after the last selected " -"member" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Remove all members referring to one of the selected primitives" @@ -9809,20 +9830,20 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" +msgstr "" "Select relation members which refer to primitives in the current selection" -msgstr "" -"Select relation members which refer to primitives in the current selection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" +msgstr "" "Select relation members which refer to {0} primitives in the current " "selection" -msgstr "" -"Select relation members which refer to {0} primitives in the current " -"selection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Select primitives for selected relation members" @@ -9921,11 +9942,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -9975,12 +9997,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "You are setting an empty role on {0} primitive." msgstr[1] "You are setting an empty role on {0} primitives." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "This is equal to deleting the roles of these primitives." @@ -10264,6 +10287,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Click do download the currently selected area" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10275,8 +10298,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10359,4 +10380,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10441,5 +10463,6 @@ msgstr "JOSM Help Browser" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10447,18 +10470,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

Help content for help topic missing

Help content for the help topic {0} " -"is not available yet. It is missing both in your local language ({1}) and in " -"english.

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

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10473,5 +10489,5 @@ "p>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10482,19 +10498,19 @@ "network problem, please check
your internet connection" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Failed to open URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Open the current help page in an external browser" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Edit the current help page" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10506,33 +10522,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Reload the current help page" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Go to the previous page" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Go to the next page" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Go to the JOSM help home page" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Warning: bad location in HTML document. Exception was: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Failed to open help page. The target URL is empty." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Failed to open help page" @@ -10646,4 +10662,8 @@ msgid "Relation {0}" msgstr "Relation {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Object" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10768,5 +10788,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Conflicts detected" @@ -11448,14 +11468,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Preparing primitives to upload ..." @@ -11609,15 +11631,4 @@ msgstr "Changeset is full" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11626,5 +11637,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11828,4 +11839,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11907,5 +11919,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12129,23 +12141,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12154,11 +12166,11 @@ msgstr[1] "There were {0} conflicts detected." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Click to close this dialogue and continue editing" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12167,32 +12179,32 @@ msgstr[1] "{0} deleted" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Dataset consistency test" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "No problems found" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Following problems found:" @@ -12938,6 +12950,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12962,7 +12974,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12977,5 +12989,5 @@ msgstr "Illegal dash pattern, at least one value must be > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13963,4 +13975,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "None" @@ -14077,15 +14090,13 @@ msgstr "Fast drawing (looks uglier)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Only interesting direction hints (e.g. with oneway tag)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Only on the head of a way." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14245,34 +14256,39 @@ msgstr "GPS Points" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Draw direction hints for way segments." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Draw the order numbers of all segments within their way." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Apply antialiasing to the map view resulting in a smoother appearance." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Draw the boundaries of data loaded from the server." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Draw virtual nodes in select mode for easy way modification." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Draw the inactive data layers in a different colour." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14280,5 +14296,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM Data" @@ -15589,4 +15605,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Validate" @@ -16248,7 +16265,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Server replied with response code 404, retrying with an individual request " @@ -16304,9 +16322,9 @@ msgstr "Preference ''{0}'' missing. Cannot initialise OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "This version of JOSM is incompatible with the configured server." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16317,21 +16335,21 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Communications with {0} established using protocol version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "unexpected format of id replied by the server, got ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16340,69 +16358,69 @@ "unexpected format of new version of modified primitive ''{0}'', got ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Creating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Successfully opened changeset {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Changeset ID > 0 expected. Got {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Updating changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Updating changeset {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Closing changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Preparing upload request..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Starting retry {0} of {1} in {2} seconds ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - trying again." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starting retry {0} of {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Current changeset is null. Cannot upload data." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID of current changeset > 0 required. Current ID is {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -18110,5 +18128,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -20061,5 +20079,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -20314,4 +20332,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21009,5 +21028,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -21111,4 +21130,8 @@ msgstr "One of the selected ways is already part of another multipolygon." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21311,22 +21334,22 @@ msgstr "Firefox executable" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21961,4 +21984,14 @@ msgid "Waypoints" msgstr "Waypoints" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relation Editor: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23097,4 +23130,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23297,13 +23386,4 @@ "a conflict and close the editor?" -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." -msgstr "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -24876,6 +24956,11 @@ msgstr "Simply convert an area to a multipolygon." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24888,15 +24973,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Imports issues from OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24905,5 +24990,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24912,10 +24997,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24926,5 +25011,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24935,15 +25020,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "The great JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24952,20 +25037,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24975,5 +25060,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24982,15 +25067,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25000,20 +25085,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25026,15 +25111,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25043,5 +25128,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25052,10 +25137,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25066,15 +25157,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25084,5 +25175,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25093,20 +25184,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 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:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40530,4 +40621,347 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "abbreviated street name" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "oneway tag on a node" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "bridge tag on a node" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "wrong highway tag on a node" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Unnamed unclassified highway" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "highway without a reference" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "temporary highway type" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "misspelt key name" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "cycleway with tag bicycle" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "footway with tag foot" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "separate cycleway as lane on a cycleway" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "barrier used on a way" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "maxspeed used for footway" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "layer tag with + sign" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "street name contains ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relation without type" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurant without name" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "unusual tag combination" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Streets NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italy" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicily - Italy" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "to {0} primitive" +#~ msgstr[1] "to {0} primtives" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Undelete {0} primitive" +#~ msgstr[1] "Undelete {0} primitives" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." + #~ msgid "Move" #~ msgstr "Move" @@ -40595,7 +41029,4 @@ #~ msgid "Delete the selected layer." #~ msgstr "Delete the selected layer." - -#~ msgid "Object" -#~ msgstr "Object" #~ msgid "There were conflicts during import." @@ -41099,4 +41530,7 @@ #~ msgid "Proxy server password" #~ msgstr "Proxy server password" + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Only interesting direction hints (e.g. with oneway tag)." #~ msgid "" @@ -41631,13 +42065,4 @@ #~ msgstr "YAHOO (GNOME)" -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Maps" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - #~ msgid "YAHOO (WebKit)" #~ msgstr "YAHOO (WebKit)" @@ -41646,40 +42071,4 @@ #~ msgstr "YAHOO (GNOME Fix)" -#~ msgid "bridge tag on a node" -#~ msgstr "bridge tag on a node" - -#~ msgid "oneway tag on a node" -#~ msgstr "oneway tag on a node" - -#~ msgid "highway without a reference" -#~ msgstr "highway without a reference" - -#~ msgid "temporary highway type" -#~ msgstr "temporary highway type" - -#~ msgid "footway with tag foot" -#~ msgstr "footway with tag foot" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "wrong highway tag on a node" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "cycleway with tag bicycle" - -#~ msgid "barrier used on a way" -#~ msgstr "barrier used on a way" - -#~ msgid "street name contains ss" -#~ msgstr "street name contains ss" - -#~ msgid "abbreviated street name" -#~ msgstr "abbreviated street name" - -#~ msgid "maxspeed used for footway" -#~ msgstr "maxspeed used for footway" - -#~ msgid "layer tag with + sign" -#~ msgstr "layer tag with + sign" - #~ msgid "Motorboat" #~ msgstr "Motorboat" @@ -41799,12 +42188,6 @@ #~ msgstr "Amount of Wires" -#~ msgid "misspelled key name" -#~ msgstr "misspelt key name" - #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK+)" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "separate cycleway as lane on a cycleway" #~ msgid "" @@ -41856,7 +42239,4 @@ #~ msgid "Can't duplicate unordered way." #~ msgstr "Can't duplicate unordered way." - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Streets NRW Geofabrik.de" #~ msgid "" @@ -41988,13 +42368,4 @@ #~ msgstr "Show Author Panel" -#~ msgid "unusual tag combination" -#~ msgstr "unusual tag combination" - -#~ msgid "relation without type" -#~ msgstr "relation without type" - -#~ msgid "restaurant without name" -#~ msgstr "restaurant without name" - #~ msgid "" #~ "The selected way(s) have nodes outside of the downloaded data region.\n" @@ -42103,7 +42474,4 @@ #~ msgstr "Please select one or more closed ways of at least four nodes." -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Maps (Tim)" - #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "" @@ -42303,7 +42671,4 @@ #~ msgid "Move Down" #~ msgstr "Move Down" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relation Editor: {0}" #~ msgid "Solve Conflict" @@ -43565,13 +43930,4 @@ #~ msgstr "Used style" -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - #~ msgid "" #~ "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" @@ -43630,7 +43986,4 @@ #~ msgstr "The server replied an error with code {0}" -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Unnamed unclassified highway" - #~ msgid "" #~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " @@ -43639,7 +43992,4 @@ #~ "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to " #~ "use changesets, but API is not able to handle them. Ignoring changesets." - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" #~ msgid "error requesting update: not zoom-level 12" @@ -44580,4 +44930,11 @@ #~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" + +#~ msgid "" #~ "Click to to return to the relation editor and to resume relation editing" #~ msgstr "" @@ -44590,4 +44947,14 @@ #~ "Current download area (minlat,minlon, maxlat, " #~ "maxlon): {0}, {1}, {2}, {3}" + +#~ msgid "Click do download the currently selected area" +#~ msgstr "Click do download the currently selected area" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." #~ msgid "" @@ -44840,31 +45207,4 @@ #~ msgstr "minor_line" -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japan (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japan (ORTHO03)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italy" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicily - Italy" - #~ msgid "" #~ "Failed to add an OAuth authentication header. There is currently no OAuth " @@ -44897,4 +45237,21 @@ #~ "Broken tagging preset \"{0}-{1}\" - number of items in display_values " #~ "must be the same as in values" + +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" #~ msgid "Error: " Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 25650) +++ /applications/editors/josm/i18n/po/es.po (revision 25651) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-03 16:05+0000\n" -"Last-Translator: Emilio Gomez Fernandez \n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-17 18:08+0000\n" +"Last-Translator: Jonay \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:16+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:20+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Ayuda" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando archivo malformado de URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,15 +108,15 @@ msgstr "Atención" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "El parámetro \"downloadgps\" no acepta nombres de archivo o URLs de archivo." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formado: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -129,13 +129,13 @@ "(compatible con Java 5) de JOSM.Más información:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Salir de JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Continuar, intentar de todas formas" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -156,4 +156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -195,18 +196,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -225,4 +226,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Acerca de" @@ -309,8 +312,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "Precaución: formato inesperado de la URL de la base API. La redirección " @@ -416,4 +419,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -497,5 +501,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -584,6 +588,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -626,51 +630,51 @@ msgstr "Por favor seleccione como mínimo tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "datos" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "capa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "selección" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflicto" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "Descarga" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "anterior" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "siguiente" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Nada seleccionado para realizar zoom" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Zoom a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Zoom de la vista a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -680,5 +684,5 @@ msgstr "Vista: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "No hay conflictos para realizar zoom" @@ -984,10 +988,11 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "" "Descargar primitivas referenciando a una de la primitivas seleccionadas" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -996,5 +1001,5 @@ msgstr "Duplicar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicar la selección mediante copiar y pegar de inmediato." @@ -1103,5 +1108,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1483,5 +1488,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Fusionar primitivos seleccionados actualmente en otra capa" @@ -1767,8 +1773,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Los datos copiados contienen primitivos incompletos. Al pegar se borrarán " @@ -1796,9 +1803,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "a {0} primitiva" -msgstr[1] "a {0} primitivas" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Eliminar {0} objeto" +msgstr[1] "Eliminar {0} objetos" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1918,4 +1925,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2875,5 +2883,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2881,4 +2889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3523,7 +3532,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3537,8 +3546,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Atención: La capa ''{0}'' ya no existe. No se puede eliminar el conflicto " @@ -3755,9 +3764,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Restaurar {0} primitiva" -msgstr[1] "Restaurar {0} primitivas" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Eliminar {0} objeto" +msgstr[1] "Eliminar {0} objetos" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4079,5 +4088,5 @@ msgstr "No en caché" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4142,8 +4151,9 @@ msgstr "Blanco de conbinacion perdida del tipo {0} con el ID {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4313,5 +4323,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "fondo" @@ -4396,5 +4406,5 @@ #, java-format msgid "Cannot instantiate projection ''{0}''" -msgstr "" +msgstr "No se puede instanciar la proyección \"{0}\"" #: ../core/src/org/openstreetmap/josm/data/projection/ProjectionInfo.java:41 @@ -4610,5 +4620,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:197 msgid "Duplicate nodes in two un-closed ways" -msgstr "" +msgstr "Nodos duplicados en dos vías no cerradas" #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:208 @@ -5031,5 +5041,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5043,4 +5053,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5508,5 +5519,5 @@ #, java-format msgid "House {0}" -msgstr "" +msgstr "Casa {0}" #. I18n: house number, street as parameter, number should remain @@ -5523,5 +5534,5 @@ #, java-format msgid "House number {0}" -msgstr "" +msgstr "Número de casa {0}" #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:161 @@ -5554,6 +5565,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5671,5 +5682,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Imágenes" @@ -5883,5 +5894,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212 msgid "Setting defaults" -msgstr "Ajustes predeterminados" +msgstr "Ajuste de predefinidos" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217 @@ -5922,5 +5933,5 @@ msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5928,10 +5939,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5939,5 +5950,5 @@ msgstr "Herramientas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5945,5 +5956,5 @@ msgstr "Predefinidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5954,5 +5965,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6365,7 +6376,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" "Las siguientes primitivas no pueden ser copiadas a la primitiva destino
" @@ -6373,5 +6385,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "La unión de las primitivas borradas ha fallado" @@ -6662,8 +6675,10 @@ msgstr "Referenciada por:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(ninguno)" @@ -6703,5 +6718,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitiva" @@ -6944,6 +6958,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6954,5 +6968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7164,5 +7178,4 @@ msgstr "Abrir una lista de todos los comandos (revertir pila)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7173,5 +7186,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7179,7 +7192,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7212,9 +7226,9 @@ msgstr "Conflictos: {0} sin resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7222,5 +7236,5 @@ "en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7428,5 +7442,5 @@ msgid "Reload all currently selected objects and refresh the list." msgstr "" -"Recarge todos los objetos actualmente seleccionados y refresque la lista" +"Recargar todos los objetos actualmente seleccionados y refrescar la lista" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:328 @@ -7583,9 +7597,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87 msgid "configure the map painting style" -msgstr "" +msgstr "configura el estilo de dibujado del mapa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88 msgid "MapPaint" -msgstr "" +msgstr "MapPaint" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304 @@ -7596,14 +7610,14 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850 msgid "Move the selected entry one row down." -msgstr "" +msgstr "Mueve hacia abajo el elemento seleccionado una fila." #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850 msgid "Move the selected entry one row up." -msgstr "" +msgstr "Mueve hacia arriba el elemento seleccionado una fila." #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:383 msgid "Reload from file" -msgstr "" +msgstr "Volver a cargar desde fichero" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:384 @@ -7617,5 +7631,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:433 msgid "Save a copy of this Style to file and add it to the list" -msgstr "" +msgstr "Guarda una copia de este Estilo a un archivo y lo añade a la lista" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:474 @@ -7824,11 +7838,11 @@ msgstr "Haga click para minimizar/maximizar el contenido del panel" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autores" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Abrir una lista de la gente trabajando en los objetos seleccionados" @@ -7842,5 +7856,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Seleccionar primitivas presentadas por este usuario" @@ -7915,4 +7930,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Corregir" @@ -8141,5 +8157,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Descarga y muestra el histórico de las primitivas seleccionadas" @@ -8180,5 +8197,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "" "Ajusta la visualización de las primitivas correspondientes en la capa de " @@ -9317,6 +9335,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9840,6 +9859,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Abrir el navegador con la para wiki de ayuda del objeto seleccionado" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9894,8 +9913,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"La relación hijo
{0}
se ha borrado del servidor. No se puede " -"cargar" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9985,8 +10002,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -9995,5 +10012,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Miembros múltiples referenciando a la misma primitiva" @@ -10010,6 +10028,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Añadir todas las primitivas seleccionadas al conjunto de datos actual antes " @@ -10017,6 +10035,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Añadir todas las primitivas seleccionadas al conjunto de datos actual antes " @@ -10024,6 +10042,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -10032,6 +10051,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -10040,5 +10060,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "" "Elimina todos los miembros que se refieran a una de las primitivas " @@ -10052,6 +10073,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "" "Seleccionar los miembros de la relación que se refieren a las primitivas de " @@ -10059,8 +10080,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Seleccionar los miembros de la relación que se refieren a {0} primitivas de " @@ -10068,5 +10088,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Seleccionar primitivas para la relación de miembros señalada" @@ -10168,11 +10189,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"La capa ''{0}'' tiene un conflicto con la primitiva
''{1}''.
Es " -"necesario resolver el conflicto antes de continuar." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" +"La capa \"{0}\" ya contiene un conflicto para el objeto
\"{1}\"." +"
Por favor resuelva este conflicto primero e intente de nuevo." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -10222,12 +10244,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Está configurando un rol vacío en la primitiva {0}" msgstr[1] "Está configurando reles vacíos en las primitivas {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Esto equivale a borrar los roles de esas primitivas." @@ -10522,6 +10545,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Haga click para descargar el área actualmente seleccionada" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10533,8 +10556,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"No están habilitados ni {0} ni {1}. " -"
Por favor escoja descargar datos de OSM, GPS o ambos." +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10617,4 +10638,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10699,5 +10721,6 @@ msgstr "Navegador de ayuda de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10705,18 +10728,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

No existe contenido de ayuda para el tema

No está disponible todavía el contenido de ayuda " -"para {0}. No existe ni en su idioma local ({1}) ni en " -"inglés.

Por favor ayude a mejorar el sistema de ayuda de JOSM " -"diligenciando la información faltante. Puede o bien editar el e tema de ayuda en su idioma local ({1}) y el tema " -"de ayuda en inglés.

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10731,5 +10747,5 @@ "traducirse):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10741,19 +10757,19 @@ "internet." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "No se pudo abrir la URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Abrir la página actual de ayuda en un navegador externo" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Editar la página de ayuda actual" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10766,24 +10782,24 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Recarga la página de ayuda actual" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Ir a la página anterior" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Ir a la página siguiente" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Ir a la página de ayuda de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" @@ -10791,9 +10807,9 @@ "Advertencia: ubicación incorrecta en el documento HTML. La excepción fue: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "No se pudo abrir la página de ayuda. La URL de destino está vacía." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Fallo al abrir la página de ayuda" @@ -10915,4 +10931,8 @@ msgid "Relation {0}" msgstr "Relación {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objeto" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -11040,5 +11060,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Se han detectado conflictos" @@ -11743,14 +11763,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando " -"esta primitiva e intentando volver a enviar los cambios." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Advertencia: El objeto \"{0}\" ya ha sido borrado del servidor. Omitiendo " +"este objeto y reintentando subir." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Preparando primitivas para subir" @@ -11910,15 +11932,4 @@ msgstr "El conjunto de cambios está lleno" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Advertencia: El objeto \"{0}\" ya ha sido borrado del servidor. Omitiendo " -"este objeto y reintentando subir." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11927,5 +11938,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -12136,4 +12147,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12215,5 +12227,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12432,5 +12444,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:171 msgid "(use server offset)" -msgstr "" +msgstr "(usar el desplazamiento del servidor)" #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:243 @@ -12438,23 +12450,23 @@ msgstr "ERROR" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "fuera del área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Advertencia: mezclando datos de 0.5 y 0.6 resulta en versión 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12463,11 +12475,11 @@ msgstr[1] "Se han detectado {0} conflictos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "botón izquierdo para cerrar este diálogo y continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12476,32 +12488,32 @@ msgstr[1] "{0} eliminados" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "sin ajustar" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Versión del API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Prueba de consistencia de conjunto de datos" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "No se han encontrado problemas" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Se encontraron los siguientes problemas" @@ -12599,19 +12611,19 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1229 msgid "increase zoom level to see more detail" -msgstr "" +msgstr "incrementa el nivel de zoom para ver más detalles" #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1233 msgid "No tiles at this zoom level" -msgstr "" +msgstr "No hay teselas a este nivel de zoom" #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1236 #, java-format msgid "Current zoom: {0}" -msgstr "" +msgstr "Zoom actual: {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1237 #, java-format msgid "Display zoom: {0}" -msgstr "" +msgstr "Mostrar zoom: {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1238 @@ -12623,5 +12635,5 @@ #, java-format msgid "Best zoom: {0}" -msgstr "" +msgstr "Zoom óptimo: {0}" #: ../core/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java:94 @@ -13259,6 +13271,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13284,7 +13296,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13301,5 +13313,5 @@ msgstr "Patrón de guiones ilegal, por lo menos un valor debe ser > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -14331,4 +14343,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Ninguno" @@ -14447,15 +14460,13 @@ msgstr "Visualización rápida (poco vistosa)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Solo en la cabecera de la vía." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14619,15 +14630,20 @@ msgstr "Puntos GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Dibujar pistas de dirección para los segmentos de vía" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Dibujar los números de orden de todos los segmentos de una vía" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -14636,10 +14652,10 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Dibujar los límites de los datos descargados del servidor" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14648,9 +14664,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Dibujar las capas inactivas en un color diferente" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14660,5 +14676,5 @@ "especificada en el estilo seleccionado." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Datos OSM" @@ -14694,5 +14710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:155 msgid "Use offset server: " -msgstr "" +msgstr "Usar servidor compensado " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:177 @@ -14738,5 +14754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:236 msgid "Tile cache directory: " -msgstr "" +msgstr "Directorio del caché de teselas: " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:258 @@ -15021,5 +15037,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:249 msgid "Potlatch 2" -msgstr "" +msgstr "Potlatch 2" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:250 @@ -15400,5 +15416,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54 msgid "Confirm all Remote Control actions manually" -msgstr "Confirma todas las acciones de Remote Control manualmente" +msgstr "Confirma todas las acciones de Control Remoto manualmente" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58 @@ -15516,9 +15532,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:674 msgid "URL / File:" -msgstr "" +msgstr "URL / Archivo:" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:688 msgid "active" -msgstr "" +msgstr "activo" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:824 @@ -15611,5 +15627,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:139 msgid "Sort presets menu" -msgstr "Ordenar menú de preajustes" +msgstr "Ordenar menú de predefinidos" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:147 @@ -15619,9 +15635,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:211 msgid "Available presets:" -msgstr "Ajustes predeterminados disponibles:" +msgstr "Predefinidos disponibles:" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:213 msgid "Active presets:" -msgstr "" +msgstr "Predefinidos activos:" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:215 @@ -15636,4 +15652,6 @@ msgid "Remove the selected presets from the list of active presets" msgstr "" +"Eliminar los predefinidos seleccionados desde la lista de predefinidos " +"activos" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:221 @@ -15644,4 +15662,5 @@ msgid "Add the selected available presets to the list of active presets" msgstr "" +"Añadir los predefinidos seleccionados a la lista de predefinidos activos" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:225 @@ -16009,4 +16028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Validar" @@ -16686,7 +16706,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "El servidor responde con el código de respuesta 404, reintentando con una " @@ -16742,9 +16763,9 @@ msgstr "Falta la preferencia \"{0}\". No puede inicializarse OsmApi" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Esta versión de JOSM es incompatible con el servidor configurado" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16755,16 +16776,16 @@ "{1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -16772,5 +16793,5 @@ "Formato de ID inesperado respondido por el servidor. Se obtuvo \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16780,64 +16801,64 @@ "obtuvo \"{1}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Creando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Conjunto de cambios {0} abierto con éxito" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Se esperaba un ID de Conjunto de Camibos > 0. Se obtuvo {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Actualizando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Actualizando conjunto de cambios {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Cerrando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Preparando solicitud de subida..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Esperando 10 segundos... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Reintentando {0} de {1} en {2} segundos..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - intentando de nuevo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Reintentando {0} de {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "El conjunto de cambios actual es nulo. No se puede subir datos." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -16846,5 +16867,5 @@ "es {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17572,5 +17593,5 @@ #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45 msgid "Add tags" -msgstr "" +msgstr "Añadir etiquetas" #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52 @@ -18600,5 +18621,5 @@ msgstr "Error en linea " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "Archivos de audio perdidos" @@ -18618,5 +18639,5 @@ #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:375 msgid "Aborted" -msgstr "" +msgstr "Abortado" #: ../plugins/CommandLine/src/CommandLine/CommandLine.java:464 @@ -18627,5 +18648,5 @@ #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:43 msgid "Command line" -msgstr "" +msgstr "Línea de comandos" #: ../plugins/CommandLine/src/CommandLine/CommandLineAction.java:42 @@ -20674,5 +20695,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -20930,7 +20951,8 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" -msgstr "Actualizar" +msgstr "Refrescar" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100 @@ -21635,5 +21657,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "Abrir MapDust" @@ -21741,4 +21763,8 @@ "Una de las vías seleccionadas es en realidad parte de otro multipolígono." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21942,22 +21968,22 @@ msgstr "Ejecutable Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "Transformación de error: Min X debe ser menor que max" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "Transformación de error: Min Y debe ser menor que max" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "Transformación de error: Puntos demasiado cerca" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Error de transformación: variante no soportada." -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Error de transformación: orientación no soportada." @@ -22600,4 +22626,14 @@ msgid "Waypoints" msgstr "Nodos de Vía" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Editor de relación: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23764,4 +23800,60 @@ msgstr "Crear una nueva llave para firmar" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23976,13 +24068,4 @@ "cerrar el editor?" -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." -msgstr "" -"La capa \"{0}\" ya contiene un conflicto para el objeto
\"{1}\"." -"
Por favor resuelva este conflicto primero e intente de nuevo." - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -25549,5 +25632,6 @@ msgid "Finds and fixes invalid street addresses in a comfortable way." msgstr "" -"Identifica y corrige las direcciones de calle no válidas una manera cómoda." +"Identifica y corrige las direcciones de calles no válidas de una manera " +"cómoda." #. Plugin globalsat @@ -25606,4 +25690,7 @@ "junction or searches in a subset of channels for junctions" msgstr "" +"Corrector de conexiones utilizado para la búsqueda y revisión de ruces de la " +"red de carreteras de OSM. El componente no funciona con los datos de OSM " +"originales, sino que estos se transforman en un canal de digrafos." #. Plugin lakewalker @@ -25642,6 +25729,11 @@ msgstr "Convierte de manera sencilla un área a un multipolígono." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25655,5 +25747,5 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" @@ -25662,5 +25754,5 @@ #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -25669,5 +25761,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25677,5 +25769,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25685,10 +25777,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "Importa un archivo PDF y los convierte a vías." #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25700,5 +25792,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25709,15 +25801,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "El gran JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25727,20 +25819,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "Añadir la opción "Reiniciar JOSM" al menú de Archivo." #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Componente para revertir conjuntos de cambios" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "Usar imagen de rgis.spb.ru como capa" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -25754,5 +25846,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -25764,15 +25856,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamiento." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." -msgstr "" +msgstr "Permite ejecutar scripts en JOSM" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25785,15 +25877,15 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "Crea y edita un mapa naútico para OpenSeaMap" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -25802,5 +25894,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25814,15 +25906,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Crea edificios entremedianeras a partir de bloques únicos" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "Crea y editar balizas de navegación para OpenSeaMap" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25833,5 +25925,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25842,10 +25934,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "Complemento para firmar digitalmente datos OSM" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25856,15 +25954,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" -msgstr "Premite recuperar un objeto eliminado desde la base de datos OSM" +msgstr "Permite recuperar un objeto eliminado desde la base de datos OSM" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "Varias utilidades que le harán la vida más sencilla." #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25877,5 +25975,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25886,5 +25984,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -25892,15 +25990,15 @@ #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "Habilitar búsqueda de punto de vía en ficheros gpx." #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "Selecciona una secuencia de vías conectadas no ramificadas" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -41353,4 +41451,347 @@ msgstr "Prueba" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "nombre abreviado de la calle" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "Nodo etiquetado como vía unidireccional" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "Nodo etiquetado como puente" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "Nodo con etiqueta de vía errónea" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Carretera sin clasificar sin nombre" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "carretera sin referencia" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "Tipo de carretera temporal" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "Nombre de clave mal escrito" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "vía ciclista con etiqueta bicicleta" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "vía peatonal con etiqueta a pie" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "carril bici etiquetado como vía ciclable" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "Barrera utilizada en una vía" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "velocidad máxima usada en una vía peatonal" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "etiqueta capa con el signo +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "El nombre de la calle contiene ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relación sin tipo" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurante sin nombre" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "combinación de etiquetas inusual" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat(espejo)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Satélite" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Calles NRW Geofabrik.de de Renania del Norte-Westfalia" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "Serie 7(OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "Japón MLIT(ORTO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japón (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japón (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japón (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italia" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicilia - Italia" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - Italia" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps(Francia)" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "a {0} primitiva" +#~ msgstr[1] "a {0} primitivas" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Restaurar {0} primitiva" +#~ msgstr[1] "Restaurar {0} primitivas" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "La capa ''{0}'' tiene un conflicto con la primitiva
''{1}''." +#~ "
Es necesario resolver el conflicto antes de continuar." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. " +#~ "Saltando esta primitiva e intentando volver a enviar los cambios." + #~ msgid "Move" #~ msgstr "Mover" @@ -41451,7 +41892,4 @@ #~ msgid "my version:" #~ msgstr "mi versión:" - -#~ msgid "Object" -#~ msgstr "Objeto" #~ msgid "" @@ -42144,25 +42582,7 @@ #~ msgstr "Mostrar fotos geoetiquetadas" -#~ msgid "bridge tag on a node" -#~ msgstr "Nodo etiquetado como puente" - -#~ msgid "oneway tag on a node" -#~ msgstr "Nodo etiquetado como vía unidireccional" - -#~ msgid "footway with tag foot" -#~ msgstr "vía peatonal con etiqueta a pie" - #~ msgid "Not yet tagged images" #~ msgstr "Fotos no etiquetadas todavía" -#~ msgid "wrong highway tag on a node" -#~ msgstr "Nodo con etiqueta de vía errónea" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "vía ciclista con etiqueta bicicleta" - -#~ msgid "layer tag with + sign" -#~ msgstr "etiqueta capa con el signo +" - #~ msgid "S" #~ msgstr "S" @@ -42177,13 +42597,7 @@ #~ msgstr "Abriendo conjunto de cambios..." -#~ msgid "abbreviated street name" -#~ msgstr "nombre abreviado de la calle" - #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" -#~ msgid "maxspeed used for footway" -#~ msgstr "velocidad máxima usada en una vía peatonal" - #~ msgid "YAHOO (WebKit)" #~ msgstr "YAHOO (WebKit)" @@ -42191,13 +42605,4 @@ #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Maps" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" #~ msgid "Navigation" @@ -42272,13 +42677,4 @@ #~ msgid "Malformed sentences: " #~ msgstr "Sentencias mal formadas: " - -#~ msgid "temporary highway type" -#~ msgstr "Tipo de carretera temporal" - -#~ msgid "barrier used on a way" -#~ msgstr "Barrera utilizada en una vía" - -#~ msgid "street name contains ss" -#~ msgstr "El nombre de la calle contiene ss" #~ msgid "Download WMS tile from {0}" @@ -42476,4 +42872,7 @@ #~ msgstr "Rastrillo" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)" + #~ msgid "Preset group ''{0}''" #~ msgstr "Grupo de predefinidos ''{0}''" @@ -42512,7 +42911,4 @@ #~ msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS" -#~ msgid "misspelled key name" -#~ msgstr "Nombre de clave mal escrito" - #~ msgid "Dupe {0} nodes into {1} nodes" #~ msgstr "{0} nodos duplicados dentro de {1} nodos" @@ -42539,10 +42935,4 @@ #~ msgstr "cartel" -#~ msgid "unusual tag combination" -#~ msgstr "combinación de etiquetas inusual" - -#~ msgid "restaurant without name" -#~ msgstr "restaurante sin nombre" - #~ msgid "No outer way for multipolygon ''{0}''." #~ msgstr "Ninguna vía exterior en el multipolígono ''{0}''." @@ -42561,7 +42951,4 @@ #~ msgid "One of the selected files was null !!!" #~ msgstr "¡¡Uno de los archivos seleccionados era nulo!!" - -#~ msgid "relation without type" -#~ msgstr "relación sin tipo" #~ msgid "Non-Way ''{0}'' in multipolygon." @@ -42794,7 +43181,4 @@ #~ msgstr "Descarga de complementos" -#~ msgid "highway without a reference" -#~ msgstr "carretera sin referencia" - #~ msgid "Combine Anyway" #~ msgstr "Combinar de todos modos" @@ -42862,7 +43246,4 @@ #~ msgid "Move Down" #~ msgstr "Mueve hacia abajo" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editor de relación: {0}" #~ msgid "Move Up" @@ -42898,7 +43279,4 @@ #~ msgid "Update Data" #~ msgstr "Actualizar datos" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "carril bici etiquetado como vía ciclable" #~ msgid "Adjust the position of the selected WMS layer" @@ -43126,7 +43504,4 @@ #~ msgstr "Tipo de Cartel" -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Maps (Tim)" - #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" @@ -43334,7 +43709,4 @@ #~ "
antes de subir cualquier dato creado mediante este componente." -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Calles NRW Geofabrik.de de Renania del Norte-Westfalia" - #~ msgid "Guidepost (Hiking)" #~ msgstr "Hito direccional (excursionismo)" @@ -43887,13 +44259,4 @@ #~ msgstr "Rotar {0} {1}" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - #~ msgid "Select a starting node on the end of a way" #~ msgstr "Seleccione un nodo de inicio en el extremo de la vía" @@ -43901,7 +44264,4 @@ #~ msgid "Reached a junction" #~ msgstr "Alcanzar una intersección" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Satélite" #~ msgid "Unnamed Junction" @@ -44521,7 +44881,4 @@ #~ "cambios y continuar?" -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Carretera sin clasificar sin nombre" - #~ msgid "Could not read file ''{0}''.
Error is:
{1}" #~ msgstr "" @@ -44931,10 +45288,4 @@ #~ msgid "Updating primitive" #~ msgstr "Oinarrizkoa eguneratzen" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" #~ msgid "Id > 0 required, got {0}" @@ -45200,10 +45551,4 @@ #~ "otra {1}" -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italia" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicilia - Italia" - #~ msgid "" #~ "Parameters --download, --downloadgps and --selection are processed in " @@ -45483,4 +45828,7 @@ #~ "en el servidor.

¿Quiere que estos nodos vuelvan a existir?" +#~ msgid "Click do download the currently selected area" +#~ msgstr "Haga click para descargar el área actualmente seleccionada" + #~ msgid "Filter Hidden: {0} Disabled: {0}" #~ msgstr "Filtrar ocultos: {0} Desactivados: {0}" @@ -45488,4 +45836,11 @@ #~ msgid "GPS point" #~ msgstr "Punto GPS" + +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "La relación hijo
{0}
se ha borrado del servidor. No se puede " +#~ "cargar" #~ msgid "Enter an upload comment (min. 3 characters)" @@ -45496,13 +45851,4 @@ #~ "Introduzca un comentario para la subida de este set de cambios (mín. 3 " #~ "caracteres)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japón (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japón (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japón (ORTHO03)" #~ msgid "" @@ -45567,4 +45913,28 @@ #~ msgstr "" #~ "No se pudieron leer los datos osm salvados automáticamente ({0}) - {1}" + +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

No existe contenido de ayuda para el " +#~ "tema

No está disponible todavía el contenido " +#~ "de ayuda para {0}. No existe ni en su idioma local " +#~ "({1}) ni en inglés.

Por favor ayude a mejorar el sistema de " +#~ "ayuda de JOSM diligenciando la información faltante. Puede o bien editar " +#~ "el e tema de ayuda en su idioma local ({1}) y el tema de ayuda en inglés.

" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "No están habilitados ni {0} ni {1}.
Por favor escoja descargar datos de OSM, GPS o ambos." #~ msgid "" @@ -45783,16 +46153,4 @@ #~ "Si no se arregla actualizando el plugin, reporte un fallo para \"{0}\"." -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat(espejo)" - -#~ msgid "7th Series (OS7)" -#~ msgstr "Serie 7(OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "Japón MLIT(ORTO)" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - Italia" - #~ msgid "Add relation" #~ msgstr "Añadir relación" @@ -45812,4 +46170,8 @@ #~ msgstr "usado" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "" +#~ "Abrir el navegador con la para wiki de ayuda del objeto seleccionado" + #~ msgid "Seamap Editor" #~ msgstr "Editor en mar" @@ -45817,7 +46179,4 @@ #~ msgid "Seanap Editor" #~ msgstr "Editor en mar" - -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps(Francia)" #~ msgid "Current projection is set to {0}" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 25650) +++ /applications/editors/josm/i18n/po/et.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-03-03 13:44+0000\n" "Last-Translator: Anne Kaaber \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:29+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:33+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Abi" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignoreerin vigast faili URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,5 +108,5 @@ msgstr "Hoiatus" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" @@ -114,10 +114,10 @@ "URL" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignoreerin vigast URL''i: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -127,13 +127,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Välju JOSMist" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Jätka, proovi ikka" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -154,4 +154,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -193,18 +194,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -223,4 +224,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Teave" @@ -310,5 +313,5 @@ msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" @@ -408,4 +411,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -488,5 +492,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -575,6 +579,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -617,51 +621,51 @@ msgstr "Palun vali vähemalt kolm sõlme." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "andmed" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "kiht" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "valik" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "vastuolu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "allalaetule" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "eelmine" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "järgmine" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Ei ole valitud midagi, millele suumida" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Suumi {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Suumi vaade {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -671,5 +675,5 @@ msgstr "Vaade: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Ei ole vastuolusid, millele suumida" @@ -971,9 +975,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Laadi alla primitiivid, mis viitavad ühele valitud primitiividest" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -982,5 +987,5 @@ msgstr "Kahekordista" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "" @@ -1088,5 +1093,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1444,5 +1449,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Liida valitud primitiivid teise kihti" @@ -1708,7 +1714,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1731,9 +1737,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Eemaldatud {0} objekt" +msgstr[1] "Eemaldatud {0} objekti" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1851,4 +1857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2772,5 +2779,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2778,4 +2785,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3370,5 +3378,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3383,5 +3391,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3586,9 +3594,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Muuda {0} objekt" +msgstr[1] "Muuda {0} objekti" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3884,5 +3892,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3940,8 +3948,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4095,5 +4104,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "taust" @@ -4788,5 +4797,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4800,4 +4809,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5293,6 +5303,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5410,5 +5420,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Aluskaart" @@ -5653,5 +5663,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5659,10 +5669,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Vaade" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5670,5 +5680,5 @@ msgstr "Tööriistad" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5676,5 +5686,5 @@ msgstr "Eelseaded" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5685,5 +5695,5 @@ msgstr "Menüü: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Heli" @@ -6071,11 +6081,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" -msgstr "" +#, fuzzy +msgid "Merging deleted objects failed" +msgstr "Ainult valitud objektid" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 @@ -6329,8 +6340,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "" @@ -6370,5 +6383,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6602,6 +6614,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6612,5 +6624,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6795,5 +6807,4 @@ msgstr "Ava kõikide käskude nimekiri (tagasivõtmise puhver)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6804,5 +6815,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6810,7 +6821,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6841,13 +6853,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Lahenda" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7422,11 +7434,11 @@ msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autorid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Ava valitud objektiga töötavate inimeste nimekiri." @@ -7440,5 +7452,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7506,4 +7518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "" @@ -7725,6 +7738,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "määramata: ei sea seda valikut valitud objektidele" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7760,6 +7774,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "Jooksvast andmekogumist ei leitud objekti, mille ID oleks {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 @@ -8892,5 +8907,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9362,5 +9377,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9414,5 +9429,5 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9502,10 +9517,10 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9519,28 +9534,29 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +msgid "Add all objects selected in the current dataset before the first member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +msgid "Add all objects selected in the current dataset after the last member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" -msgstr "" +msgstr "Tühista valitud rollid või kustuta valitud liikmed" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" -msgstr "" +msgstr "Tühista valitud rollid või kustuta valitud liikmed" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Laadi alla primitiivid, mis viitavad ühele valitud primitiividest" #. putValue(NAME, tr("Remove Selected")); @@ -9551,6 +9567,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9558,11 +9573,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Kustuta valitud seos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9654,8 +9669,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9707,11 +9723,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -9988,5 +10004,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -9999,5 +10015,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10081,4 +10097,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10163,5 +10180,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10169,11 +10187,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10184,5 +10202,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10191,19 +10209,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10213,33 +10231,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10351,4 +10369,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10461,5 +10483,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "" @@ -11097,12 +11119,14 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Primitiivide üleslaadimiseks ettevalmistamine..." @@ -11234,13 +11258,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11249,5 +11264,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11440,4 +11455,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11519,5 +11535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11729,23 +11745,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Andmekiht {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11754,11 +11770,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11767,32 +11783,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12506,6 +12522,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12529,7 +12545,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12544,5 +12560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13437,4 +13453,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "" @@ -13551,14 +13568,12 @@ msgstr "" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" - -#. only on the head of a way +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 +msgid "Only on the head of a way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 -msgid "Only on the head of a way." +msgid "Draw oneway arrows." msgstr "" @@ -13706,34 +13721,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13741,5 +13761,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "" @@ -14997,4 +15017,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "" @@ -15626,5 +15647,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15678,9 +15699,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15689,21 +15710,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15711,69 +15732,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Sulgen muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Üleslaadimispäringu ettevalmistamine..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17314,5 +17335,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19211,5 +19232,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19461,4 +19482,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20148,5 +20170,5 @@ msgstr "" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20250,4 +20272,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20438,22 +20464,22 @@ msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21086,4 +21112,14 @@ #: build/trans_presets.java:691 msgid "Waypoints" +msgstr "" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Ava valiku nimekirja aken." + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" msgstr "" @@ -22222,4 +22258,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22409,11 +22501,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -23950,6 +24035,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -23959,15 +24049,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -23975,5 +24065,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -23981,10 +24071,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -23993,5 +24083,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24000,15 +24090,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24016,20 +24106,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24039,5 +24129,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24046,15 +24136,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24064,20 +24154,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24087,15 +24177,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24104,5 +24194,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24111,10 +24201,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24123,15 +24219,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24141,5 +24237,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24148,20 +24244,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39583,4 +39679,323 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "lühendatud tänava nimi" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "ühesuunaline silt sõlmel (oneway)" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "silla silt sõlmel" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "vale maantee silt sõlmel" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Nimeta kategoriseerimata tee" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "viiteta maantee" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "ajutise maantee tüüp" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "valesti kirjutatud maantee silt" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "jalgrattatee jalgratta sildiga (cycleway vs cycle)" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "kõnnitee jala sildiga (footway vs foot)" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "cycleway ei saa olla rida cyclewayl" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "tõke teel" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "kõnniteele on määratud maksimaalne kiirus" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "kihi silt + märgiga" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "tänava nimi sisaldab ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relatsioon ilma tüübita" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "nimeta restoran" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "ebatavaline sildikombinatsioon" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (peegel)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Tänavad NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Tšehhi CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Tšehhi UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7. seeria (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Jaapan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Jaapan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Jaapan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Jaapan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Itaalia" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sitsiilia - Itaalia" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - Itaalia" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Upload these changes?" #~ msgstr "Kas laen need muudatused üles?" @@ -39674,7 +40089,4 @@ #~ msgid "my version:" #~ msgstr "minu versioon:" - -#~ msgid "Object" -#~ msgstr "Objekt" #~ msgid "OSM password" @@ -40066,19 +40478,4 @@ #~ msgstr "YAHOO (GNOME parandatud)" -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Tänavad NRW Geofabrik.de" - -#~ msgid "unusual tag combination" -#~ msgstr "ebatavaline sildikombinatsioon" - -#~ msgid "street name contains ss" -#~ msgstr "tänava nimi sisaldab ss" - -#~ msgid "abbreviated street name" -#~ msgstr "lühendatud tänava nimi" - -#~ msgid "layer tag with + sign" -#~ msgstr "kihi silt + märgiga" - #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" @@ -40092,46 +40489,4 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Maps (Tim)" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Maps" - -#~ msgid "bridge tag on a node" -#~ msgstr "silla silt sõlmel" - -#~ msgid "misspelled key name" -#~ msgstr "valesti kirjutatud maantee silt" - -#~ msgid "temporary highway type" -#~ msgstr "ajutise maantee tüüp" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "vale maantee silt sõlmel" - -#~ msgid "barrier used on a way" -#~ msgstr "tõke teel" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "jalgrattatee jalgratta sildiga (cycleway vs cycle)" - -#~ msgid "footway with tag foot" -#~ msgstr "kõnnitee jala sildiga (footway vs foot)" - -#~ msgid "maxspeed used for footway" -#~ msgstr "kõnniteele on määratud maksimaalne kiirus" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "cycleway ei saa olla rida cyclewayl" - -#~ msgid "oneway tag on a node" -#~ msgstr "ühesuunaline silt sõlmel (oneway)" #~ msgid "standard" @@ -40553,46 +40908,7 @@ #~ msgstr "Alade ühendamine: Eemalda lühikesed teed" -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Tšehhi UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Tšehhi CUZK:KM" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7. seeria (OS7)" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sitsiilia - Itaalia" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Itaalia" - #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Jaapan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Jaapan (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Jaapan (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Jaapan (ORTHO03)" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" @@ -40604,7 +40920,4 @@ #~ msgstr "\"{0}\" ei ole suletud ning seega ei saa seda ühendada." -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Nimeta kategoriseerimata tee" - #~ msgid "Waterway Point" #~ msgstr "Veetee punkt" @@ -40619,10 +40932,4 @@ #~ msgstr "mast" -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (peegel)" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - Itaalia" - #~ msgid "any substance" #~ msgstr "mistahes aine" @@ -40640,13 +40947,4 @@ #~ msgstr "Aktiivsed stiilid" -#~ msgid "relation without type" -#~ msgstr "relatsioon ilma tüübita" - -#~ msgid "restaurant without name" -#~ msgstr "nimeta restoran" - -#~ msgid "highway without a reference" -#~ msgstr "viiteta maantee" - #~ msgid "Adjust the position of the selected WMS layer" #~ msgstr "Kohenda valitud WMS kihi asukohta." Index: /applications/editors/josm/i18n/po/eu.po =================================================================== --- /applications/editors/josm/i18n/po/eu.po (revision 25650) +++ /applications/editors/josm/i18n/po/eu.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-03-04 14:46+0000\n" "Last-Translator: ST \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:31+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:34+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Laguntza" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Gaizki eratutako fitxategiaren URL-a baztertzen: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,5 +108,5 @@ msgstr "Kontuz" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" @@ -114,10 +114,10 @@ "izenak onartzen ezta artxiboen URLak ere" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Gaizki eratutako URL-a baztertzen: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -127,13 +127,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Irten JOSMtik" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Jarraitu, saiatu edonola ere" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -154,4 +154,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -193,18 +194,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -223,4 +224,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Honi buruz" @@ -307,8 +310,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "KONTUZ: API-aren URL oinarria ezusteko formatuan. Informazio edo Historia " @@ -414,4 +417,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -496,5 +500,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -583,6 +587,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -625,51 +629,51 @@ msgstr "Mesedez, aukera itzazu hiru nodo gutxienez" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "datuak" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "geruza" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "aukeraketa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "gatazka" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "deskargatu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "aurrekoa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "hurrengoa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Ez da ezer aukeratu zoom egiteko." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Egin zoom {0} mailara" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Egin ezazu ikustpegiaren zooma {0} mailara." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -679,5 +683,5 @@ msgstr "Ikusi: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Ez dago gatazkarik zoom egiteko" @@ -981,11 +985,12 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "" "Aukeraturiko jatorrizko bati erreferentzia egiten dioten jatorrizkoak " "deskargatu." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -994,5 +999,5 @@ msgstr "Bikoiztu" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Bikoiztu aukeratutakoa kopiatu eta berehala itsatsi erabiliz" @@ -1100,5 +1105,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1461,5 +1466,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Batu itzazu aukeraturiko jatorrizkoak beste geruza batean" @@ -1747,8 +1753,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Kopiatutako datuek jatorrizko osatugabeak dauzka. Itsastean jatorrizko " @@ -1774,9 +1781,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "{0} jatorrizkora" -msgstr[1] "{0} jatorrizkoetara" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Ezabatu {0} objektua" +msgstr[1] "Ezabatu {0} objektuak" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1897,4 +1904,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2855,5 +2863,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2861,4 +2869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3504,7 +3513,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3519,8 +3528,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Kontuz: ''{0}'' geruza ez da gehiago existitzen. Ezin da jatorrizko ''{1}''-" @@ -3735,9 +3744,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Berreskuratu jatorrizko {0}(a)" -msgstr[1] "Berreskuratu jatorrizko {0}(ak)" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Ezabatu {0} objektua" +msgstr[1] "Ezabatu {0} objektuak" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4055,5 +4064,5 @@ msgstr "Ez dago aurrememorian" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4115,8 +4124,9 @@ msgstr "Galdu egin da {1} ID-a duen {0} motako ageriko helburua" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4279,5 +4289,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "hondoa" @@ -4980,5 +4990,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4992,4 +5002,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5499,6 +5510,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5616,5 +5627,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5871,5 +5882,5 @@ msgstr "{0} hobespena ezabatu dugu ez bait da jadanik erabiltzen." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5877,10 +5888,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Ikusi" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5888,5 +5899,5 @@ msgstr "Tresnak" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5894,5 +5905,5 @@ msgstr "Aurrezarpenak" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5903,5 +5914,5 @@ msgstr "Menua: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audioa" @@ -6306,7 +6317,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" "Ondoko primitibak ezin izan ditugu helburu primitibara kopiatu
helburu " @@ -6314,5 +6326,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Ezabatutako primitibak batzeak huts egin du" @@ -6585,8 +6598,10 @@ msgstr "Noren erreferentzia:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(bat ere ez)" @@ -6626,5 +6641,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitiboa" @@ -6859,6 +6873,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6869,5 +6883,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7052,5 +7066,4 @@ msgstr "" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7061,5 +7074,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7067,7 +7080,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7098,13 +7112,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Konpondu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7679,11 +7693,11 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Egileak" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "" @@ -7698,5 +7712,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7764,4 +7778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "" @@ -7983,6 +7998,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "Aukeratutako objektuen historia erakutsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -8018,6 +8034,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "Ez dugu {0} ID-a duen objekturik aurkitu uneko datuen artean" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 @@ -9150,5 +9167,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9620,5 +9637,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9672,5 +9689,5 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9760,10 +9777,10 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9777,28 +9794,32 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "Uneko datu geruzako aldaketa guztiak OSM zerbitzarira igo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "Uneko datu geruzako aldaketa guztiak OSM zerbitzarira igo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" -msgstr "" +msgstr "Uneko datu geruzako aldaketa guztiak OSM zerbitzarira igo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "" +"Aukeraturiko jatorrizko bati erreferentzia egiten dioten jatorrizkoak " +"deskargatu." #. putValue(NAME, tr("Remove Selected")); @@ -9809,18 +9830,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" -msgstr "" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" +msgstr "Ezabatu erlazio kide hau erlaziotik" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Aukeratutako erlazioa ezabatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9912,8 +9933,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9965,11 +9987,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -10245,5 +10267,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -10256,5 +10278,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10338,4 +10360,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10420,5 +10443,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10426,11 +10450,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10441,5 +10465,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10448,19 +10472,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10470,33 +10494,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10608,4 +10632,9 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +#, fuzzy +msgid "Object" +msgstr "objektua" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10718,5 +10747,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Gatazkak aurkitu dira" @@ -11351,13 +11380,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Kargatzeko aldaketarik ez." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11488,13 +11519,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11503,5 +11525,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11694,4 +11716,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11771,5 +11794,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11981,23 +12004,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12006,11 +12029,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12019,32 +12042,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12764,6 +12787,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12787,7 +12810,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12802,5 +12825,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13695,4 +13718,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "" @@ -13809,14 +13833,12 @@ msgstr "" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" - -#. only on the head of a way +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 +msgid "Only on the head of a way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 -msgid "Only on the head of a way." +msgid "Draw oneway arrows." msgstr "" @@ -13964,34 +13986,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13999,5 +14026,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "" @@ -15243,4 +15270,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "" @@ -15870,5 +15898,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15922,9 +15950,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15933,21 +15961,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15955,69 +15983,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17551,5 +17579,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19448,5 +19476,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19698,4 +19726,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20383,5 +20412,5 @@ msgstr "" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20485,4 +20514,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20673,22 +20706,22 @@ msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21321,4 +21354,14 @@ #: build/trans_presets.java:691 msgid "Waypoints" +msgstr "" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Guraso-erlazioak" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" msgstr "" @@ -22457,4 +22500,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22644,11 +22743,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24204,6 +24296,11 @@ msgstr "Azalera bat multipoligono batean bilakatzen du era errazean." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24213,15 +24310,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "OpenStreetBugs-etik akatsak jaisten ditu" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24231,5 +24328,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24239,10 +24336,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24253,5 +24350,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24262,15 +24359,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "JGoodies Plastic handiaren \"Look and Feel\"-a." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24279,20 +24376,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Aldaketa-multzoak" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24302,5 +24399,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24312,15 +24409,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Bideratzaile-gaitasunak ematen ditu" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24333,15 +24430,15 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -24350,5 +24447,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24362,15 +24459,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24381,5 +24478,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24390,10 +24487,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24404,5 +24507,5 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" @@ -24411,10 +24514,10 @@ #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24427,5 +24530,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24437,20 +24540,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Elkar-konektaturiko bide luzeen deskarga erraza" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "Aukeratu adarkadura ez dute konektaturiko bideak" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39874,4 +39977,333 @@ msgstr "Proba" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "kale izen laburtua" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "Norabide bakarrean etiketatutako nodoa" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "Zubi moduan etiketatutako nodoa" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "okerreko bide-etiketa nodo batean" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Klasifikatu gabeko izen gabeko errepidea" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "erreferentziarik gabeko errepidea" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "behin-behineko bide mota" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "Gako izena giaizki idatzita" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "bidegorria \"bizikleta\" etiketarekin" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "Oinezkoentzako bidea \"oinezkoentzat\" etiketararekin" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "bide batean erabilitako oztopoa" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "oinezko bide batentzako erabilitako gehienezko abiadura" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "+ zeinua duen etiketa-geruza" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "kale izenak ss dauka" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "motarik gabeko erlazioa" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "izenik gabeko jatetxea" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "ez-ohiko etiketa konbinaketa" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo sateiltea" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "NRW Geofabrik.de kaleak" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Mapak" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Mapak (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (Zazpigarren Serieak) (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japonia (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japonia (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japonia (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japonia (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italia" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sizilia - Italia" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "{0} jatorrizkora" +#~ msgstr[1] "{0} jatorrizkoetara" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Berreskuratu jatorrizko {0}(a)" +#~ msgstr[1] "Berreskuratu jatorrizko {0}(ak)" + #~ msgid "Unsaved Changes" #~ msgstr "Gorde gabeko aldaketak" @@ -40113,19 +40545,4 @@ #~ msgstr "Jatorrizkoa eguneratzen" -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Mapak (Tim)" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Mapak" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" @@ -40134,22 +40551,4 @@ #~ msgstr "Terraserver Topo" -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "unusual tag combination" -#~ msgstr "ez-ohiko etiketa konbinaketa" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - -#~ msgid "relation without type" -#~ msgstr "motarik gabeko erlazioa" - -#~ msgid "restaurant without name" -#~ msgstr "izenik gabeko jatetxea" - -#~ msgid "Upload all changes in the current data layer to the OSM server" -#~ msgstr "Uneko datu geruzako aldaketa guztiak OSM zerbitzarira igo" - #~ msgid "Select, move and rotate objects" #~ msgstr "Objektuak aukeratu, mugitu eta errotatu" @@ -40157,7 +40556,4 @@ #~ msgid "Update selections" #~ msgstr "Aukeraketak eguneratu" - -#~ msgid "abbreviated street name" -#~ msgstr "kale izen laburtua" #~ msgid "Use decimal degrees." @@ -40410,57 +40806,6 @@ #~ msgstr "Markatu 'aldatutako' bandera {0} erlaziorako" -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (Zazpigarren Serieak) (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japonia (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japonia (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japonia (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japonia (ORTHO03)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italia" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sizilia - Italia" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "bidegorria \"bizikleta\" etiketarekin" - -#~ msgid "footway with tag foot" -#~ msgstr "Oinezkoentzako bidea \"oinezkoentzat\" etiketararekin" - #~ msgid "\"{0}\" is not closed and therefore cannot be joined." #~ msgstr "\"{0}\" itxi gabe dagoenez, ezin dugu lotu" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo sateiltea" - -#~ msgid "highway without a reference" -#~ msgstr "erreferentziarik gabeko errepidea" - -#~ msgid "misspelled key name" -#~ msgstr "Gako izena giaizki idatzita" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Klasifikatu gabeko izen gabeko errepidea" - -#~ msgid "bridge tag on a node" -#~ msgstr "Zubi moduan etiketatutako nodoa" - -#~ msgid "oneway tag on a node" -#~ msgstr "Norabide bakarrean etiketatutako nodoa" #~ msgid "Negative values denote Western/Southern hemisphere." @@ -40500,27 +40845,6 @@ #~ msgstr "Galdu egin da {0} ID-a duen objektuaren ageriko helburua" -#~ msgid "barrier used on a way" -#~ msgstr "bide batean erabilitako oztopoa" - -#~ msgid "street name contains ss" -#~ msgstr "kale izenak ss dauka" - -#~ msgid "maxspeed used for footway" -#~ msgstr "oinezko bide batentzako erabilitako gehienezko abiadura" - -#~ msgid "layer tag with + sign" -#~ msgstr "+ zeinua duen etiketa-geruza" - -#~ msgid "temporary highway type" -#~ msgstr "behin-behineko bide mota" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "okerreko bide-etiketa nodo batean" - #~ msgid "standard" #~ msgstr "estandarra" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "NRW Geofabrik.de kaleak" #~ msgid "Amenities" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 25650) +++ /applications/editors/josm/i18n/po/fi.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-02-19 09:12+0000\n" "Last-Translator: Mika Laari \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:17+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:30+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Ohje" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ohitetaan virheellinen tiedosto-URL: ”{0}”" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Varoitus" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parametrin ”downloadgps” arvoksi ei kelpaa tiedoston URL eikä nimi." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Jätetään huomiotta virheellinen URL-osoite: ”{0}”" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -128,13 +128,13 @@ "yhteensopivaa) versiota JOSMista.Lisää tietoa:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Poistu JOSMista" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Jatka, yritä silti" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -155,4 +155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -194,18 +195,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -224,4 +225,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Tietoja" @@ -308,8 +311,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "VAROITUS: Odottamaton sovellusrajapinnan URL-perusosoitteen muoto. " @@ -415,4 +418,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -497,5 +501,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -584,6 +588,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -626,51 +630,51 @@ msgstr "Valitse ainakin kolme pistettä." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "tietoihin" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "tasoon" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "valintaan" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "ristiriita" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "lataukseen" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "edelliseen" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "seuraavaan" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Ei mitään valittuna näkymän sovittamiseksi" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Sovita näkymä {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Sovita {0} näkymään." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -680,5 +684,5 @@ msgstr "Näytä: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Ei ristiriitoja" @@ -980,9 +984,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Lataa kaikki objektit, jotka viittaavat valittuihin objekteihin." -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -991,5 +996,5 @@ msgstr "Monista" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Monistaa valinnan tekemällä peräkkäin toiminnot kopioi ja liitä." @@ -1097,5 +1102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1456,5 +1461,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Yhdistä valitut objektit toiselle tasolle" @@ -1737,8 +1743,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Kopioitu data sisältää keskeneräisiä objekteja. Liitettäessä keskeneräiset " @@ -1763,9 +1770,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "{0} alkioon" -msgstr[1] "{0} alkioon" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Poista {0} objekti" +msgstr[1] "Poista {0} objektia" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1884,4 +1891,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2831,5 +2839,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2837,4 +2845,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3471,7 +3480,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3485,8 +3494,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Varoitus: Tasoa \"{0}\" ei ole enää olemassa. Objektin \"{1}\" ristiriitaa " @@ -3701,9 +3710,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Palauta {0} objekti" -msgstr[1] "Palauta {0} objektia" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Poista {0} objekti" +msgstr[1] "Poista {0} objektia" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4023,5 +4032,5 @@ msgstr "Ei välimuistissa" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4085,8 +4094,9 @@ msgstr "Kohteelta, jonka tyyppi on {0} ja numero {1}, puuttuu yhdistämiskohde" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4248,5 +4258,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "tausta" @@ -4955,5 +4965,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4967,4 +4977,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5472,6 +5483,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5589,5 +5600,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5837,5 +5848,5 @@ msgstr "Asetus {0} on poistettu koska sitä ei enää tarvita." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5843,10 +5854,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Näytä" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5854,5 +5865,5 @@ msgstr "Työkalut" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5860,5 +5871,5 @@ msgstr "Esivalinnat" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5869,5 +5880,5 @@ msgstr "Valikko: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Ääni" @@ -6272,7 +6283,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" "Seuraavia objekteja ei voitu kopioida lähdejoukosta, koska
\r\n" @@ -6280,5 +6292,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Virhe poistettujen objektien yhdistämisessä" @@ -6553,8 +6566,10 @@ msgstr "Viittaaja:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(ei mitään)" @@ -6594,5 +6609,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6827,6 +6841,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6837,5 +6851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7036,5 +7050,4 @@ "Avaa listan tekemistäsi muutoksista (kumottavissa olevat toimenpiteet)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7045,5 +7058,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7051,7 +7064,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7084,14 +7098,14 @@ msgstr "Ristiriidat: {0} selvittämätöntä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Selvitä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" "Avaa yhdistämiskehotteen kaikista valituista kohteista ylläolevalle listalle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7674,11 +7688,11 @@ msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Tekijät" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Näytä valittujen kohteiden muokkaajat." @@ -7692,5 +7706,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Valitse tämän käyttäjän lähettämät objektit" @@ -7758,4 +7773,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Korjaa" @@ -7982,5 +7998,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Lataa ja näytä valittujen objektien historia" @@ -8020,5 +8037,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Näytä merkityt objektit aktiiviselta datatasolta" @@ -9152,6 +9170,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "Näytä muutoskokoelmaan kuuluvat objektit aktiiviselta datatasolta" @@ -9626,5 +9645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9678,7 +9697,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Lapsirelaatio
{0}
on poistettu palvelimelta. Sitä ei voi ladata." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9767,8 +9785,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -9777,5 +9795,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Useat jäsenet viittaavat samaan objektiin" @@ -9791,6 +9810,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Lisää kaikki nykyisestä datajoukosta valitut objektit ensimmäisen jäsenen " @@ -9798,6 +9817,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Lisää kaikki nykyisestä datajoukosta valitut objektit viimeisen jäsenen " @@ -9805,6 +9824,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9813,6 +9833,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9821,5 +9842,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Poista kaikki jäsenet, jotka viittaavat valittuihin objekteihin" @@ -9831,6 +9853,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "" "Valitse ne relaatiojäsenet, jotka viittaavat nykyisessä valinnassa oleviin " @@ -9838,8 +9860,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Valitse relaatiojäsenet, jotka viittaavat {0} nykyisessä valinnassa olevaan " @@ -9847,5 +9868,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Valitse objektit, joihin valitut relaatiojäsenet viittaavat" @@ -9944,11 +9966,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"Objektilla
''{1}''
on jo ristiriita tasolla ''{0}''.
Selvitä " -"ensin aiempi ristiriita, ja yritä sitten uudelleen." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -9998,12 +10019,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Olet antamassa tyhjän roolin {0} objektille." msgstr[1] "Olet antamassa tyhjän roolin {0} objektille." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Se vastaa roolin poistamista näiltä objekteilta." @@ -10282,5 +10304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -10293,5 +10315,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10375,4 +10397,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10457,5 +10480,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10463,11 +10487,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10478,5 +10502,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10485,19 +10509,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10507,33 +10531,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10646,4 +10670,8 @@ msgid "Relation {0}" msgstr "Relaatio {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekti" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10768,5 +10796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Ristiriitoja" @@ -11420,14 +11448,14 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Varoitus: objekti \"{0}\" on jo poistettu palvelimelta. Se ohitetaan, ja " -"koetetaan jatkaa lähetystä." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Valmistellaan lähetettävät objektit..." @@ -11573,13 +11601,4 @@ msgstr "Muutoskokoelma on täynnä" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11588,5 +11607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11783,4 +11802,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11862,5 +11882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12072,23 +12092,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Datataso {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "ladatun alueen ulkopuolella" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12097,11 +12117,11 @@ msgstr[1] "Havaittiin {0} ristiriitaa." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12110,32 +12130,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Muuta GPX-tasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Virheitä ei löydetty" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Löytyneet virheet:" @@ -12860,6 +12880,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12883,7 +12903,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12898,5 +12918,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13793,4 +13813,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Ei mitään" @@ -13907,15 +13928,13 @@ msgstr "Nopea piirto (näyttää rumemmalta)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Vain polun päähän." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14069,25 +14088,30 @@ msgstr "GPS-pisteet" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Piirrä suuntanuolet polkujen segmenteille." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Piirrä polkujen segmenteille järjestysnumerot." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Piirrä palvelimelta ladatun datan alueen reunat." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14095,9 +14119,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Piirrä epäaktiiviset tasot eri värillä." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14105,5 +14129,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM-data" @@ -15359,4 +15383,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Tarkista" @@ -15996,7 +16021,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Palvelimelta saatiin virhekoodi 404, joten yritetään lähettää kaikki " @@ -16052,9 +16078,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16063,21 +16089,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16086,69 +16112,69 @@ "Objektin \"{0}\" uuden version muoto poikkeaa odotetusta. Saatiin \"{1}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Muutoskokoelmaa luodaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Muutoskokoelma {0} avattiin onnistuneesti" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Muutoskokoelmaa päivitetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Muutoskokoelmaa {0} päivitetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Muutoskokoelmaa suljetaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Valmistellaan lähetystä..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17727,5 +17753,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19633,5 +19659,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19883,4 +19909,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20578,5 +20605,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20680,4 +20707,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20874,22 +20905,22 @@ msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21522,4 +21553,14 @@ #: build/trans_presets.java:691 msgid "Waypoints" +msgstr "" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relaatioeditori: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" msgstr "" @@ -22658,4 +22699,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22845,11 +22942,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24395,6 +24485,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24404,15 +24499,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24420,5 +24515,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24426,10 +24521,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24438,5 +24533,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24445,15 +24540,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24461,20 +24556,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24484,5 +24579,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24491,15 +24586,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24509,20 +24604,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24532,15 +24627,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24549,5 +24644,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24556,10 +24651,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24568,15 +24669,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24586,5 +24687,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24593,20 +24694,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40028,4 +40129,323 @@ msgstr "" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "tien nimessä lyhenne" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "avain \"oneway\" pisteellä" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "avain \"bridge\" pisteellä" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "väärä \"highway\" arvo" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Nimetön tie" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "tie ilman tien numeroa" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "väärinkirjoitettu avain" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "bicycle-merkitty pyörätie" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "'footway' tagin 'foot' kanssa" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "Pyörätiellä myös pyöräkaista" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "Este tien ominaisuutena" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "nopeusrajoitus jalkakäytävällä" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "Avaimen layer arvossa \"+\"-merkki" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "kadun nimi sisältää ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relaatio ilman tagia \"type\"" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "nimetön ravintola" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "poikkeuksellinen tagiyhdistelmä" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE-kartat" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE-kartat (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "50-60 luvun kartat Briteistä (Ordnance Survey 7th Series)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italy" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicily - Italy" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Enter values for all conflicts." #~ msgstr "Syötä arvot kaikille ristiriidoille." @@ -40034,4 +40454,28 @@ #~ msgstr "Suljettu polku" +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "{0} alkioon" +#~ msgstr[1] "{0} alkioon" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Palauta {0} objekti" +#~ msgstr[1] "Palauta {0} objektia" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Objektilla
''{1}''
on jo ristiriita tasolla ''{0}''." +#~ "
Selvitä ensin aiempi ristiriita, ja yritä sitten uudelleen." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Varoitus: objekti \"{0}\" on jo poistettu palvelimelta. Se ohitetaan, ja " +#~ "koetetaan jatkaa lähetystä." + #~ msgid "Unknown version" #~ msgstr "Tuntematon versio" @@ -40066,7 +40510,4 @@ #~ msgid "Add all currently selected objects as members" #~ msgstr "Lisää valitut objektit jäseniksi" - -#~ msgid "Object" -#~ msgstr "Objekti" #~ msgid "Not implemented yet." @@ -40346,13 +40787,4 @@ #~ msgid "help" #~ msgstr "ohje" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE-kartat" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" #~ msgid "Only two nodes allowed" @@ -40600,4 +41032,7 @@ #~ "Enimmäispituus (metreissä) pisteiden välisille viivoille. Arvolla -1 " #~ "piirretään aina peräkkäisten pisteiden välit." + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)." #~ msgid "" @@ -40794,7 +41229,4 @@ #~ msgstr[1] "" #~ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?" - -#~ msgid "misspelled key name" -#~ msgstr "väärinkirjoitettu avain" #~ msgid "Boat" @@ -40973,22 +41405,4 @@ #~ msgid "{0} were found to be gps tagged." #~ msgstr "{0} kuvasta löytyi gps-sijaintitiedot." - -#~ msgid "highway without a reference" -#~ msgstr "tie ilman tien numeroa" - -#~ msgid "relation without type" -#~ msgstr "relaatio ilman tagia \"type\"" - -#~ msgid "abbreviated street name" -#~ msgstr "tien nimessä lyhenne" - -#~ msgid "maxspeed used for footway" -#~ msgstr "nopeusrajoitus jalkakäytävällä" - -#~ msgid "layer tag with + sign" -#~ msgstr "Avaimen layer arvossa \"+\"-merkki" - -#~ msgid "restaurant without name" -#~ msgstr "nimetön ravintola" #~ msgid "WMS Plugin Preferences" @@ -41102,7 +41516,4 @@ #~ msgstr "optikko" -#~ msgid "cycleway with tag bicycle" -#~ msgstr "bicycle-merkitty pyörätie" - #~ msgid "Tags (empty value deletes tag)" #~ msgstr "Tagit (tyhjä arvo poistaa tagin)" @@ -41196,7 +41607,4 @@ #~ msgid "Move Up" #~ msgstr "Siirrä ylöspäin" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relaatioeditori: {0}" #~ msgid "Server does not support changesets" @@ -41311,13 +41719,4 @@ #~ msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa" -#~ msgid "unusual tag combination" -#~ msgstr "poikkeuksellinen tagiyhdistelmä" - -#~ msgid "barrier used on a way" -#~ msgstr "Este tien ominaisuutena" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "Pyörätiellä myös pyöräkaista" - #~ msgid "More than one \"via\" found." #~ msgstr "Useita \"via\" -jäseniä." @@ -41476,7 +41875,4 @@ #~ msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi." -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Nimetön tie" - #~ msgid "There are no selected primitives to update." #~ msgstr "Päivitettäviä objekteja ei valittuna." @@ -41556,31 +41952,4 @@ #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." #~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"." - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japan (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italy" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicily - Italy" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japan (ORTHO03)" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE-kartat (Tim)" - -#~ msgid "street name contains ss" -#~ msgstr "kadun nimi sisältää ss" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "väärä \"highway\" arvo" - -#~ msgid "footway with tag foot" -#~ msgstr "'footway' tagin 'foot' kanssa" #~ msgid "\"{0}\" is not closed and therefore can't be joined." @@ -41713,10 +42082,4 @@ #~ msgstr "" #~ "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." - -#~ msgid "bridge tag on a node" -#~ msgstr "avain \"bridge\" pisteellä" - -#~ msgid "oneway tag on a node" -#~ msgstr "avain \"oneway\" pisteellä" #~ msgctxt "filter" @@ -41742,4 +42105,11 @@ #~ msgid "Travel" #~ msgstr "Matkailu" + +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Lapsirelaatio
{0}
on poistettu palvelimelta. Sitä ei voi " +#~ "ladata." #~ msgid "" @@ -41870,10 +42240,4 @@ #~ "viimeksi. Haluatko palauttaa tiedot?" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "7th Series (OS7)" -#~ msgstr "50-60 luvun kartat Briteistä (Ordnance Survey 7th Series)" - #~ msgid "Projection ''{0}'' not found" #~ msgstr "Projektiota \"{0}\" ei löytynyt" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 25650) +++ /applications/editors/josm/i18n/po/fr.po (revision 25651) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-04 11:14+0000\n" -"Last-Translator: Tbj \n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-20 15:42+0000\n" +"Last-Translator: Casiope \n" "Language-Team: Fr <>\n" "MIME-Version: 1.0\n" @@ -14,16 +14,16 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:18+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:15+0000\n" +"X-Generator: Launchpad (build 12617)\n" "X-Poedit-Language: French\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -33,12 +33,12 @@ msgstr "Aide" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "L’adresse du fichier est invalide, elle est ignorée : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -107,15 +107,15 @@ msgstr "Avertissement" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Le paramètre \"downloadgps\" n’accepte pas de noms ni d’URL de fichiers." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "L’adresse du fichier est invalide, elle est ignorée : \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -124,18 +124,17 @@ "version of JOSM.More Info:" msgstr "" -"

JOSM recquiert Java version 6.

Version de Java détectée : {0}." -"
Vous pouvez
  • mettre à jour votre Java (JRE) ou
  • utiliser " -"une ancienne version de JOSM (compatible Java 5).
Plus " -"d'information :" - -#: ../core/src/org/openstreetmap/josm/Main.java:761 +"

JOSM recquiert Java version 6.

Version détectée : {0}.
Vous " +"pouvez
  • mettre à jour votre Java (JRE) ou
  • utiliser une " +"ancienne version de JOSM (compatible Java 5).
Plus d'informations :" + +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Quitter JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Continuer, essayer tout de même" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -156,4 +155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -195,18 +195,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -225,4 +225,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "À propos" @@ -230,5 +232,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 msgid "Display the about screen." -msgstr "Afficher le \"À propos\"" +msgstr "Afficher la fenêtre \"À propos\"" #. TODO: put in a platformHook for system that have no console by default @@ -280,5 +282,5 @@ #: build/trans_surveyor.java:64 msgid "Info" -msgstr "Info" +msgstr "Informations" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79 @@ -302,5 +304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66 msgid "Plugins" -msgstr "Extensions" +msgstr "Greffons" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87 @@ -309,12 +311,12 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "Attention : le format URL de l’API est inattendue. La redirection vers la " -"page OSM info ou historique de la primitive échouera probablement. L’URL " -"est : ''{0}''" +"page d’informations OSM ou d’historique de l’objet échouera probablement. " +"L’URL est : ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 @@ -415,4 +417,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -444,9 +447,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:62 msgid "Please select the target layer." -msgstr "Veuillez sélectionner le calque de destination." +msgstr "Sélectionnez le calque de destination :" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:66 msgid "Select target layer" -msgstr "Sélectionnez le calque de destination" +msgstr "Sélection du calque de destination" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 @@ -497,5 +500,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -584,6 +587,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -608,5 +611,5 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88 msgid "Information" -msgstr "Information" +msgstr "Informations" #. Do it! @@ -626,51 +629,51 @@ msgstr "Sélectionnez au moins trois nœuds." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "les données" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "calque" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "sélection" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflit" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "télécharger" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "précédent" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "suivant" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Aucune sélection sur laquelle zoomer." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Zoomer sur {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Zoomer la vue sur {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -680,5 +683,5 @@ msgstr "Afficher : {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Aucun problème sur lequel zoomer" @@ -825,5 +828,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:49 msgid "Create multipolygon." -msgstr "Créer un multipolygone." +msgstr "Créer un multipolygone" #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:60 @@ -883,5 +886,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:105 msgid "File exists. Overwrite?" -msgstr "Ce fichier existe déjà. L'écraser ?" +msgstr "Ce fichier existe déjà. L’écraser ?" #. Do it! @@ -894,5 +897,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 msgid "Distribute the selected nodes to equal distances along a line." -msgstr "Répartir les nœuds sélectionnés à égale distance le long d’une ligne." +msgstr "Répartir les nœuds sélectionnés à égale distance le long d’une ligne" #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33 @@ -948,5 +951,5 @@ #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:91 msgid "Object ID:" -msgstr "Identifiant de l'objet :" +msgstr "Identifiant de l’objet :" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:65 @@ -956,10 +959,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78 msgid "Download Object" -msgstr "Télécharger l'objet" +msgstr "Télécharger l’objet" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44 msgid "Download object" -msgstr "Télécharger l'objet" +msgstr "Télécharger l’objet" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84 @@ -974,19 +977,18 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99 msgid "Invalid ID specified. Cannot download object." -msgstr "" -"L'identifiant spécifié est invalide. Impossible de télécharger l'objet." +msgstr "L’identifiant est invalide. Impossible de télécharger l’objet." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30 msgid "Download parent ways/relations..." -msgstr "Télécharger des chemins ou des relations…" +msgstr "Télécharger des chemins ou des relations parents …" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" -"Télécharger les primitives se rapportant à une des primitives sélectionnées" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "Télécharger les objets se rapportant à une des objets sélectionnés" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -995,5 +997,5 @@ msgstr "Copier" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Dupliquer la sélection par un copier-coller" @@ -1005,5 +1007,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20 msgid "Make a duplicate of the currently selected layer." -msgstr "Dupliquer le calque actuellement sélectionné." +msgstr "Dupliquer le calque sélectionné." #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 @@ -1061,5 +1063,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:354 msgid "Export the data to GPX file." -msgstr "Exporter les données vers un fichier GPX." +msgstr "Exporter les données vers un fichier GPX" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 @@ -1091,5 +1093,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:31 msgid "Adjust imagery offset" -msgstr "Ajuster le décalage de l'imagerie" +msgstr "Ajuster le décalage de l’imagerie" #. Strings in JFileChooser @@ -1101,5 +1103,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1126,5 +1128,5 @@ #: build/specialmessages.java:69 msgid "OK" -msgstr "OK" +msgstr "Valider" #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:162 @@ -1163,9 +1165,9 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19 msgid "Info about Element" -msgstr "Information sur l'élément" +msgstr "Informations sur l’élément" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "Afficher les informations des nœuds, chemins ou relations." +msgstr "Afficher les informations sur les nœuds, chemins ou relations." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 @@ -1184,5 +1186,5 @@ msgid "One of the selected ways is not closed and therefore cannot be joined." msgstr "" -"L'un des chemins sélectionnés n'est pas fermé et ne peut donc pas être joint." +"L’un des chemins sélectionnés n’est pas fermé et ne peut donc pas être joint." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340 @@ -1193,7 +1195,7 @@ "The selected ways have nodes outside of the downloaded data region." msgstr[0] "" -"Le chemin sélectionné a des nœuds à l'extérieur de la zone téléchargée." +"Le chemin sélectionné a des nœuds à l’extérieur de la zone téléchargée." msgstr[1] "" -"Les chemins sélectionnés ont des nœuds à l'extérieur de la zone téléchargée." +"Les chemins sélectionnés ont des nœuds à l’extérieur de la zone téléchargée." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343 @@ -1266,6 +1268,6 @@ msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways." msgstr "" -"Désolé, mais il n'est pas possible de modifier des relations multipolygone " -"ayant plusieurs chemins externes." +"Désolé. Impossible de modifier des relations multipolygones avec plusieurs " +"chemins externes." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1251 @@ -1298,5 +1300,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1438 msgid "Remove tags from inner ways" -msgstr "Supprime les attributs des chemins internes" +msgstr "Supprimer les attributs des chemins internes" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1471 @@ -1395,9 +1397,9 @@ #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109 msgid "Custom WMS Link" -msgstr "Lien WMS Personalisé" +msgstr "Lien WMS personnalisé" #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116 msgid "Supported Rectifier Services:" -msgstr "Services de rectification supportés :" +msgstr "Services de rectification :" #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:141 @@ -1412,5 +1414,5 @@ #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:158 msgid "Add Rectified Image" -msgstr "Ajouter l’Image rectifiée" +msgstr "Ajouter l’image rectifiée" #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:210 @@ -1478,6 +1480,7 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" -msgstr "Fusionner les primitives sélectionnées dans un autre calque" +#, fuzzy +msgid "Merge the currently selected objects into another layer" +msgstr "Fusionner les objets sélectionnés dans un autre calque" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1542,5 +1545,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 msgid "Edit latitude and longitude of a node." -msgstr "Modifier la latitude et la longitude d’un nœud." +msgstr "Modifier la latitude et la longitude d’un nœud" #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 @@ -1560,5 +1563,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:50 msgid "Open a file." -msgstr "Ouvrir un fichier." +msgstr "Ouvrir un fichier" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:99 @@ -1570,8 +1573,6 @@ msgid "Cannot open {0} file with the file importer ''{1}''." msgid_plural "Cannot open {0} files with the file importer ''{1}''." -msgstr[0] "" -"Impossible d’ouvrir {0} fichier avec l’importateur de fichier \"{1}\"." -msgstr[1] "" -"Impossible d’ouvrir {0} fichiers avec l’importateur de fichier \"{1}\"." +msgstr[0] "Impossible d’ouvrir {0} fichier avec l’importateur \"{1}\"." +msgstr[1] "Impossible d’ouvrir {0} fichiers avec l’importateur \"{1}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:156 @@ -1625,9 +1626,9 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77 msgid "Enter URL to download:" -msgstr "Saisir l’URL à télécharger :" +msgstr "Saisir l’URL pour télécharger :" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79 msgid "Enter an URL from where data should be downloaded" -msgstr "Entrer l’URL depuis laquelle les données devraient être téléchargées" +msgstr "Saisir l’URL depuis laquelle les données devraient être téléchargées" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88 @@ -1762,12 +1763,13 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" -msgstr "" -"Les données copiées contiennent des primitives incomplètes. Au collage, les " -"primitives incomplètes sont retirées. Voulez-vous coller les données sans " -"les primitives incomplètes ?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" +msgstr "" +"Les données copiées contiennent des objets incomplets. Au collage, les " +"objets incomplets sont retirés. Voulez-vous coller les données sans les " +"objets incomplets ?" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 @@ -1790,9 +1792,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "vers la primitive {0}" -msgstr[1] "vers les primitives {0}" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Supprimer {0} objet" +msgstr[1] "Supprimer {0} objets" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1911,4 +1913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -1927,5 +1930,5 @@ #, java-format msgid "File {0} exists. Overwrite?" -msgstr "Le fichier {0} existe. L’écraser ?" +msgstr "Le fichier {0} existe déjà. L’écraser ?" #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 @@ -2005,6 +2008,6 @@ msgid "Show status report with useful information that can be attached to bugs" msgstr "" -"Afficher le rapport d’état avec les informations utiles pouvant être " -"attachées aux bugs" +"Ouvrir le rapport d’état avec les informations pouvant être attachées aux " +"bugs" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 @@ -2061,5 +2064,5 @@ #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96 msgid "Cancel operation" -msgstr "Annuler l'opération" +msgstr "Annuler l’opération" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87 @@ -2196,5 +2199,5 @@ #, java-format msgid "Split way {0} into {1} parts" -msgstr "Couper le chemin {0} en {1} parties" +msgstr "Couper le chemin {0} en {1}" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 @@ -2205,5 +2208,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 msgid "Draw lines between raw gps points." -msgstr "Dessiner des lignes entre les points GPS." +msgstr "Tracer des lignes entre les points GPS." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 @@ -2235,5 +2238,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 msgid "The current selection cannot be used for unglueing." -msgstr "Rien ne peut être séparé dans la sélection." +msgstr "Aucun chemin ne peut être séparé dans la sélection." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 @@ -2243,19 +2246,18 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 msgid "* One tagged node, or" -msgstr "* Un nœud avec attribut, ou" +msgstr "* un nœud avec attribut" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 msgid "* One node that is used by more than one way, or" -msgstr "* Un nœud utilisé par plus d’un chemin, ou" +msgstr "* un nœud utilisé par plus d’un chemin" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 msgid "* One node that is used by more than one way and one of those ways, or" -msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou" +msgstr "* un nœud utilisé par plus d’un chemin et un de ces chemins" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "" "* One way that has one or more nodes that are used by more than one way, or" -msgstr "" -"* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou" +msgstr "* un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 @@ -2263,5 +2265,5 @@ "* One way and one or more of its nodes that are used by more than one way." msgstr "" -"* Un chemin et un ou plusieurs de ses nœuds utilisés par plus d’un chemin." +"* un chemin et un ou plusieurs de ses nœuds utilisés par plus d’un chemin" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 @@ -2272,5 +2274,5 @@ "own copy and all nodes will be selected." msgstr "" -"Note : Si un chemin est sélectionné, il recevra des nouvelles copies des\n" +"Si un chemin est sélectionné, il recevra des nouvelles copies des\n" "nœuds séparés et les nouveaux nœuds seront sélectionnés. Sinon, tous\n" "les chemins recevront leur propre copie et tous les nœuds seront " @@ -2351,5 +2353,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:28 msgid "Update modified" -msgstr "Mise à jour des modifications" +msgstr "Actualiser les modifications" #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:26 @@ -2372,5 +2374,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89 msgid "Update selection" -msgstr "Mettre à jour la sélection" +msgstr "Actualiser la sélection" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87 @@ -2402,6 +2404,6 @@ "''{0}''.
You have to resolve them first." msgstr "" -"Les données devant être envoyées au serveur OSM ont des conflits non " -"résolus dans le calque ''{0}''.
Vous devez d’abord les résoudre." +"Les données ont des conflits non résolus dans le calque ''{0}''." +"
Vous devez d’abord les résoudre avant d’envoyer." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 @@ -2460,15 +2462,15 @@ #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:21 msgid "Viewport Following" -msgstr "" +msgstr "Suivi de la vue" #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:23 msgid "Enable/disable automatic moving of the map view to last placed node" msgstr "" -"Activer/Déactiver le déplacement automatique de la carte sur le dernier nœud " -"placé" +"Activer/Désactiver le déplacement automatique de la carte sur le dernier " +"nœud placé" #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24 msgid "Toggle Viewport Following" -msgstr "" +msgstr "Activer/Désactiver le suivi de la vue" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23 @@ -2480,5 +2482,5 @@ #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25 msgid "Enable/disable rendering the map as wireframe only" -msgstr "Activer/désactiver l’affichage en mode \"fil de fer\"" +msgstr "Activer/Désactiver l’affichage en mode \"fil de fer\"" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26 @@ -2635,5 +2637,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:156 msgid "Click to abort and to resume editing" -msgstr "Annuler et reprendre l’édition" +msgstr "Annuler et reprendre les modifications" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 @@ -2663,8 +2665,8 @@ "Click {0} to check the state of these objects on the server." msgstr[0] "" -"Cliquer sur {0} pour vérifier l'état de cet objet sur le " +"Cliquer sur {0} pour vérifier l’état de cet objet sur le " "serveur." msgstr[1] "" -"Cliquer sur {0} pour vérifier l'état de ces objets sur le " +"Cliquer sur {0} pour vérifier l’état de ces objets sur le " "serveur." @@ -2695,6 +2697,6 @@ msgid "There was {0} conflict during import." msgid_plural "There were {0} conflicts during import." -msgstr[0] "Il y avait {0} conflit durant l'importation." -msgstr[1] "Il y avait {0} conflits durant l'importation." +msgstr[0] "Il y a eu {0} conflit durant l'importation." +msgstr[1] "Il y a eu {0} conflits durant l'importation." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:181 @@ -2756,5 +2758,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90 msgid "Draw" -msgstr "Dessiner" +msgstr "Tracer" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:89 @@ -2869,5 +2871,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2875,4 +2877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3012,9 +3015,9 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 msgid "Please enter a search string." -msgstr "Entrez un mot à rechercher." +msgstr "Entrez un mot à rechercher :" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143 msgid "Enter the search expression" -msgstr "Entrez l'expression de recherche" +msgstr "Saisir la recherche" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 @@ -3036,9 +3039,9 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "case sensitive" -msgstr "respecter la casse" +msgstr "Respecter la casse" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "all objects" -msgstr "tous les objets" +msgstr "Tous les objets" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164 @@ -3048,24 +3051,26 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:165 msgid "regular expression" -msgstr "expression régulière" +msgstr "Expression régulière" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" -"Baker Street - ''Baker'' et ''Street'' dans n’importe quelle clé ou " -"nom." +"Baker Street - recherche ''Baker'' et ''Street'' dans n’importe " +"quelle clé ou nom" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -"\"Baker Street\" - ''Baker Street'' dans n’importe quelle clé ou nom." +"\"Baker Street\" - recherche ''Baker Street'' dans n’importe quelle " +"clé ou nom" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "name:Bak - ''Bak'' anywhere in the name." -msgstr "name:Bak - ''Bak'' n’importe où dans le nom." +msgstr "name:Bak - recherche ''Bak'' n’importe où dans le nom" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "type=route - key ''type'' with value exactly ''route''." -msgstr "type=route - clé ''type'' avec la valeur exacte ''route''." +msgstr "" +"type=route - recherche la clé ''type'' avec la valeur exacte ''route''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 @@ -3074,18 +3079,19 @@ "type=, *=*, *=" msgstr "" -"type=* - clé ''type'' avec n’importe quelle valeur. Essayez aussi " -"*=valeur, type=, *=*, *=" +"type=* - recherche la clé ''type'' avec n’importe quelle valeur. " +"Essayez aussi *=valeur, type=, *=*, *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "-name:Bak - not ''Bak'' in the name." -msgstr "-name:Bak - pas ''Bak'' dans le nom." +msgstr "-name:Bak - ignore ''Bak'' dans le nom" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "oneway? - oneway=yes, true, 1 or on" -msgstr "oneway? - oneway=yes, true, 1 ou on" +msgstr "oneway? - recherche l’attribut oneway=yes, true, 1 ou on" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "foot: - key=foot set to any value." -msgstr "foot: - key=foot avec n’importe quelle valeur." +msgstr "" +"foot: - recherche l’attribut key=foot avec n’importe quelle valeur." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 @@ -3097,20 +3103,22 @@ "type: - type of the object (node, way, relation)" msgstr "" -"type: - type de l’objet (node, way, relation)" +"type: - recherche selon le type de l’objet (node, way, " +"relation)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "user:... - all objects changed by user" -msgstr "user:... - tous les objets modifiés par l’utilisateur" +msgstr "user:... - recherche tous les objets modifiés par l’utilisateur" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -"user:anonymous - tous les objets changés par des utilistateurs " -"anonymes" +"user:anonymous - recherche tous les objets modifiés par des " +"utilisateurs anonymes" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -"id:… - objet avec l’identifiant indiqué (0 pour les nouveaux objets)" +"id:… - recherche l’objet avec l’identifiant indiqué (0 pour les " +"nouveaux objets)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 @@ -3119,6 +3127,6 @@ "assigned version)" msgstr "" -"version:... - objet avec la version donnée (0 objets n’ayant pas de " -"version attribuée)" +"version:... - recherche l’objet avec la version indiquée (0 pour les " +"objets sans version)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 @@ -3127,6 +3135,6 @@ "assigned changeset)" msgstr "" -"changeset:... - objet avec l’identifiant du groupe de modifications " -"donné (0 objets sans groupe de modifications attribué)" +"changeset:... - recherche l’objet avec l’identifiant du groupe de " +"modifications indiqué (0 pour les objets sans groupe de modifications)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 @@ -3135,6 +3143,6 @@ "min-max)" msgstr "" -"nodes:... - objet avec un nombre donné de nœuds (nodes:total ou nodes:" -"min-max)" +"nodes:... - recherche l’objet avec le nombre indiqué de nœuds (nodes:" +"total ou nodes:min-max)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 @@ -3143,10 +3151,11 @@ "max)" msgstr "" -"tags:... - objet avec un nombre donné d’attributs (tags:total ou tags:" -"min-max)" +"tags:... - recherche l’objet avec le nombre d’attributs indiqué (tags:" +"total ou tags:min-max)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "role:... - object with given role in a relation" -msgstr "role:... - objet avec un rôle donné dans une relation" +msgstr "" +"role:... - recherche l’objet avec le rôle indiqué dans une relation" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 @@ -3155,22 +3164,22 @@ "12T14:51:09Z, 2009-11-12 or T14:51 ...)" msgstr "" -"timestamp:... - objets possédant ce tampon horodateur (2009-11-" -"12T14:51:09Z, 2009-11-12 ou T14:51 ...)" +"timestamp:... - recherche l’objet possédant l’horodatage indiqué " +"(2009-11-12T14:51:09Z, 2009-11-12 ou T14:51 ...)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "modified - all changed objects" -msgstr "modified - tous les objets modifiés" +msgstr "modified - recherche tous les objets modifiés" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "selected - all selected objects" -msgstr "selected - tous les objets sélectionnés" +msgstr "selected - recherche tous les objets sélectionnés" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "incomplete - all incomplete objects" -msgstr "incomplete - tous les objets incomplets" +msgstr "incomplete - recherche tous les objets incomplets" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "untagged - all untagged objects" -msgstr "untagged - tous les objets sans attribut" +msgstr "untagged - recherche tous les objets sans attribut" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 @@ -3178,6 +3187,6 @@ "child expr - all children of objects matching the expression" msgstr "" -"child expr - tous les enfants des objets satisfaisant " -"l’expression" +"child expr - recherche tous les enfants des objets " +"satisfaisant l’expression indiquée" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 @@ -3185,16 +3194,16 @@ "parent expr - all parents of objects matching the expression" msgstr "" -"parent expr - tous les parents des objets satisfaisant " -"l’expression" +"parent expr - recherche tous les parents des objets " +"satisfaisant l’expression indiquée" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "Use | or OR to combine with logical or" -msgstr "Utilisez | ou OR pour combiner avec le OU logique" +msgstr "| ou OR - pour combiner avec le OU logique" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -"Utilisez \" pour encadrer les opérateurs (par exemple si la clé " -"contient :)" +"\" - pour encadrer les opérateurs (par exemple si la clé contient :" +")" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208 @@ -3203,11 +3212,10 @@ "escaped by a preceding \\ (e.g. \\\" and \\\\)." msgstr "" -"À l'intérieur de guillemets, les caractères \" et \\ doivent " -"être échappés par un \\ les précédent (par exemple : \\\" et " -"\\\\)." +"À l’intérieur des guillemets, les caractères \" et \\ doivent " +"être précédés par un \\ (par exemple : \\\" et \\\\)." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209 msgid "Use ( and ) to group expressions" -msgstr "Utilisez ( et ) pour grouper des expressions" +msgstr "( et ) - pour grouper des expressions" #. Strings in JFileChooser @@ -3233,5 +3241,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221 msgid "Start Search" -msgstr "Commencer la recherche" +msgstr "Rechercher" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 @@ -3319,5 +3327,6 @@ "{1}" msgstr "" -"Erreur d’analyse de l’expression régulière \"{0}\", erreur complète:\n" +"L’expression régulière \"{0}\" a une erreur de syntaxe. Détail de " +"l’erreur :\n" "\n" "{1}" @@ -3333,6 +3342,5 @@ msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -"Type de primitive inconnue : {0}. Les valeurs autorisées sont node, way ou " -"relation" +"Type d’objet inconnu : {0}. Les valeurs autorisées sont node, way ou relation" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:638 @@ -3356,5 +3364,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:696 msgid "Primitive id expected" -msgstr "Identifiant de primitive attendu" +msgstr "Identifiant de l’objet attendu" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:698 @@ -3365,5 +3373,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704 msgid "Changeset id expected" -msgstr "Identifiant de groupe de modifications attendu" +msgstr "Identifiant du groupe de modifications attendu" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:706 @@ -3432,5 +3440,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:113 msgid "Data with errors. Upload anyway?" -msgstr "Les données contiennent des erreurs. Envoyer quand même ?" +msgstr "Les données contiennent des erreurs. Envoyer ?" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65 @@ -3522,11 +3530,11 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" -"Le calque \"{0}\" a déjà un conflit pour la primitive
\"{1}\". Ce conflit ne peut pas être ajouté." +"Le calque \"{0}\" a déjà un conflit pour l’objet
\"{1}\"
. Ce " +"conflit ne peut pas être ajouté." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36 @@ -3536,11 +3544,11 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Attention : le calque ''{0}'' n’existe plus. Impossible de retirer le " -"conflit de la primitive ''{1}''." +"conflit de l’objet ''{1}''." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67 @@ -3642,5 +3650,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:435 msgid "Delete confirmation" -msgstr "Confirmation de suppression" +msgstr "Confirmer la suppression" #. leave message in one tr() as there is a grammatical @@ -3755,9 +3763,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "{0} primitive restaurée" -msgstr[1] "{0} primitives restaurées" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Supprimer {0} objet" +msgstr[1] "Supprimer {0} objets" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3795,6 +3803,6 @@ "its nodes are suggested in order to maintain data consistency." msgstr "" -"Les modifications suivantes des attributs sont suggérées après l’inversion " -"du chemin pour préserver la consistance des données." +"Les modifications de ces attributs sont suggérées pour préserver la " +"consistance des données lors de l’inversion du chemin." #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26 @@ -3836,5 +3844,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:74 msgid "Please select which property changes you want to apply." -msgstr "Sélectionnez les modifications que vous voulez appliquer." +msgstr "Sélectionnez les modifications que vous voulez appliquer :" #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:86 @@ -3848,5 +3856,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134 msgid "Automatic tag correction" -msgstr "Correction automatique d’attribut" +msgstr "Correction d’attribut" #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:83 @@ -4026,5 +4034,5 @@ #, java-format msgid "Already registered a conflict for primitive ''{0}''." -msgstr "un conflit est déjà enregistré pour la primitive \"{0}\"" +msgstr "Un conflit est déjà enregistré pour l’objet \"{0}\"" #. * @@ -4080,9 +4088,9 @@ msgstr "Pas en cache" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" msgstr "" -"La projection ''{0}'' est introuvable, le favori ''{1}'' n'est pas utilisable" +"La projection ''{0}'' est introuvable, le signet ''{1}'' n’est pas utilisable" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:295 @@ -4091,6 +4099,5 @@ "Unable to add primitive {0} to the dataset because it is already included" msgstr "" -"Impossible d’ajouter la primitive {0} au jeu de données parce qu'elle est " -"déjà inclue" +"Impossible d’ajouter l’objet {0} au jeu de données parce qu'il est déjà inclu" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:703 @@ -4101,8 +4108,8 @@ "error, it should be safe to continue in your work." msgstr "" -"JOSM s’attendait à trouver les primitives [{0} {1}] dans le jeu de données " -"mais pas ici. Veuillez le rapporter sur http://josm.openstreetmap.de . " -"Néanmoins, ce n’est pas une erreur critique. Vous pouvez continuer à " -"travailler en toute sécurité." +"JOSM s’attendait à trouver les objets [{0} {1}] dans le jeu de données mais " +"pas ici. Veuillez le rapporter sur http://josm.openstreetmap.de . Néanmoins, " +"ce n’est pas une erreur critique. Vous pouvez continuer à travailler en " +"toute sécurité." #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 @@ -4145,8 +4152,9 @@ msgstr "Cible de fusion manquante pour le type {0} avec l’identifiant {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4185,9 +4193,9 @@ msgstr "" "Impossible d’attribuer un identifiant de groupe de modifications positif à " -"une nouvelle primitive. L’identifiant est {0}" +"une nouvel objet. L’identifiant est {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:755 msgid "A primitive with ID = 0 cannot be invisible." -msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible." +msgstr "Un objet avec un identifiant égal à 0 ne peut pas être invisible." #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1393 @@ -4196,6 +4204,4 @@ "other is not" msgstr "" -"fusion impossible parce que un des deux primitive est nouvelle alors que " -"l'autre ne l'est pas" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1395 @@ -4204,6 +4210,6 @@ "Cannot merge primitives with different ids. This id is {0}, the other is {1}" msgstr "" -"Impossible de fusionner des primitives avec différents identifiants. Le " -"premier identifiant est {0}, le second est {1}" +"Impossible de fusionner des objets avec différents identifiants. Le premier " +"identifiant est {0}, le second est {1}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 @@ -4252,6 +4258,6 @@ "multiple values." msgstr "" -"Une collection d’attributs ne peut pas être appliqué à une primitive lorsque " -"des clés ont des valeurs multiples." +"Une collection d’attributs ne peut pas être appliqué à un objet lorsque des " +"clés ont des valeurs multiples." #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:324 @@ -4265,6 +4271,6 @@ msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''." msgstr "" -"Impossible de comparer la primitive avec l’identifiant ''{0}'' à la " -"primitive avec l’identifiant ''{1}''." +"Impossible de comparer l’objet avec l’identifiant ''{0}'' à l’objet avec " +"l’identifiant ''{1}''." #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48 @@ -4313,5 +4319,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "arrière-plan" @@ -4379,5 +4385,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193 msgid "Lambert CC Zone" -msgstr "Zone de projection conique conforme de Lambert" +msgstr "Zone de projection conique conforme de Lambert :" #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:132 @@ -4396,5 +4402,5 @@ #, java-format msgid "Cannot instantiate projection ''{0}''" -msgstr "" +msgstr "Impossible d’appliquer la projection ''{0}''" #: ../core/src/org/openstreetmap/josm/data/projection/ProjectionInfo.java:41 @@ -4447,5 +4453,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:126 msgid "UTM Zone" -msgstr "Zone UTM" +msgstr "Zone UTM :" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:145 @@ -4460,9 +4466,9 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:152 msgid "Hemisphere" -msgstr "Hémisphère" +msgstr "Hémisphère :" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:161 msgid "Offset 3.000.000m east" -msgstr "Décalage 3 000 000 m Est" +msgstr "Décalage 3 000 000 m Est :" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26 @@ -4492,5 +4498,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419 msgid "UTM Geodesic system" -msgstr "Système UTM Geodesic" +msgstr "Système géodésique UTM" #: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:264 @@ -4555,5 +4561,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java:45 msgid "Coastlines." -msgstr "Lignes de côte." +msgstr "Lignes de côte" #: ../core/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java:46 @@ -4575,5 +4581,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:44 msgid "Crossing ways." -msgstr "Chemins se croisant." +msgstr "Chemins se croisant" #: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:45 @@ -4583,5 +4589,5 @@ msgstr "" "Vérifier si deux routes, voies ferrées, voies fluviales ou bâtiments se " -"croisent dans le même calque mais ne sont pas connectés par un nœud." +"croisent mais ne sont pas connectés par un nœud." #: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:119 @@ -4669,6 +4675,5 @@ "This test checks that there are no ways with same tags and same node " "coordinates." -msgstr "" -"Vérifier si des chemins ont les mêmes coordonnées et les mêmes attributs." +msgstr "Vérifier si des chemins ont les mêmes coordonnées et attributs." #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:168 @@ -4678,9 +4683,9 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java:23 msgid "Duplicated way nodes." -msgstr "Nœuds dechemin dupliqués." +msgstr "Nœuds de chemin dupliqués." #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java:24 msgid "Checks for ways with identical consecutive nodes." -msgstr "Vérifier si les chemins contiennent des nœuds consécutifs identiques." +msgstr "Vérifier si les chemins ont des nœuds consécutifs identiques." #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicatedWayNodes.java:38 @@ -4692,5 +4697,5 @@ #: build/trans_presets.java:4073 msgid "Multipolygon" -msgstr "Multipolygone" +msgstr "Multipolygones" #: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52 @@ -4767,14 +4772,14 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java:62 msgid "Nodes with same name" -msgstr "Nœuds avec un nom similaire." +msgstr "Nœuds avec un nom similaire" #: ../core/src/org/openstreetmap/josm/data/validation/tests/NodesWithSameName.java:25 msgid "This test finds nodes that have the same name (might be duplicates)." msgstr "" -"Chercher les nœuds avec un nom similaire (ils pourraient être dupliqués)." +"Chercher les nœuds avec un nom similaire qui pourraient être dupliqués." #: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:45 msgid "Overlapping ways." -msgstr "Chemins superposés." +msgstr "Chemins superposés" #: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:46 @@ -4783,5 +4788,5 @@ "than one way." msgstr "" -"Vérifier qu’une connexion entre deux nœuds n’est pas utilisée par plus d’un " +"Vérifier si une connexion entre deux nœuds n’est pas utilisée par plus d’un " "chemin." @@ -4816,9 +4821,9 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:40 msgid "Relation checker :" -msgstr "Vérificateur de relation :" +msgstr "Vérificateur de relation." #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:41 msgid "This plugin checks for errors in relations." -msgstr "Ce greffon vérifie les erreurs dans les relations." +msgstr "Vérifier les erreurs dans les relations." #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:100 @@ -4875,5 +4880,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java:35 msgid "Self-intersecting ways" -msgstr "Chemin se coupant en lui-même." +msgstr "Chemins se coupant sur eux-mêmes" #: ../core/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java:24 @@ -4881,10 +4886,10 @@ "This test checks for ways that contain some of their nodes more than once." msgstr "" -"Vérifier que les chemins ne contiennent pas certains nœuds plus d’une fois." +"Vérifier si les chemins ne contiennent pas certains nœuds plus d’une fois." #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:41 #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:85 msgid "Similarly named ways" -msgstr "Chemins de nom similaire" +msgstr "Chemins avec un nom similaire" #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:42 @@ -4899,5 +4904,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:153 msgid "This plugin checks for errors in property keys and values." -msgstr "Vérifie les erreurs dans les clés et les valeurs." +msgstr "Ce greffon vérifie les erreurs dans les clés et les valeurs." #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:265 @@ -4955,9 +4960,9 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:448 msgid "Invalid property key" -msgstr "Clé de propriété invalide" +msgstr "Clé invalide" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:453 msgid "Invalid white space in property key" -msgstr "Espace invalide dans une clé" +msgstr "Espace invalide dans la clé" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:458 @@ -4972,39 +4977,38 @@ #, java-format msgid "Key ''{0}'' not in presets." -msgstr "La clé « {0} » ne fait pas partie des modèles." +msgstr "La clé « {0} » ne fait pas partie des balises." #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:488 msgid "Presets do not contain property key" -msgstr "Les modèles ne contiennent pas de clé d’attribut" +msgstr "Les balises ne contiennent pas de clé" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:507 #, java-format msgid "Value ''{0}'' for key ''{1}'' not in presets." -msgstr "La valeur « {0} » pour la clé « {1} » ne fait pas partie des modèles." +msgstr "La valeur « {0} » pour la clé « {1} » ne fait pas partie des balises." #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:508 msgid "Presets do not contain property value" -msgstr "Les modèles ne contiennent pas de valeur d’attribut" +msgstr "Les balises ne contiennent pas de valeur" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:520 msgid "FIXMES" -msgstr "FIXMES" +msgstr "FIXME" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:565 msgid "Check property keys." -msgstr "Vérifier les clés de propriétés." +msgstr "Vérifier les clés" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:566 msgid "Validate that property keys are valid checking against list of words." -msgstr "Valider les clés de propriété avec la liste de mots." +msgstr "" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:573 msgid "Use complex property checker." -msgstr "Utiliser un vérificateur de propriétés complexe." +msgstr "Utiliser un vérificateur d’attributs complexe" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:574 msgid "Validate property values and tags using complex rules." -msgstr "" -"Valider les attributs et les valeurs en utilisant des règles complexes." +msgstr "Valider les attributs en utilisant des règles complexes." #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590 @@ -5029,5 +5033,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5041,7 +5045,8 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" -msgstr "Édition" +msgstr "Modifier" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:624 @@ -5081,27 +5086,27 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:662 msgid "Data sources" -msgstr "Sources des données" +msgstr "Sources des données :" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:683 msgid "Check property values." -msgstr "Vérifier les valeurs des propriétés." +msgstr "Vérifier les valeurs" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:684 msgid "Validate that property values are valid checking against presets." -msgstr "Valider les valeurs d’attribut par rapport aux modèles." +msgstr "Valider les valeurs par rapport aux balises." #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:691 msgid "Check for FIXMES." -msgstr "Vérifier les FIXMES." +msgstr "Vérifier les FIXME" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:692 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -"Chercher les nœuds et chemins possédant la valeur FIXME pour n’importe quel " -"attribut." +"Chercher les nœuds et chemins possédant la valeur FIXME pour n’importe " +"quelle valeur." #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:699 msgid "Use default data file." -msgstr "Utiliser le fichier de données par défaut." +msgstr "Utiliser le fichier de données par défaut" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:700 @@ -5119,5 +5124,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:707 msgid "Use default spellcheck file." -msgstr "Utiliser la vérification orthographique par défaut." +msgstr "Utiliser la vérification orthographique par défaut" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:708 @@ -5157,5 +5162,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:35 msgid "This test checks if turnrestrictions are valid" -msgstr "Ce test vérifie si les interdictions de tourner sont valides" +msgstr "Vérifier si les interdictions de tourner sont valides" #: ../core/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java:84 @@ -5211,9 +5216,9 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32 msgid "Unclosed Ways." -msgstr "Chemins non fermés." +msgstr "Chemins non fermés" #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32 msgid "This tests if ways which should be circular are closed." -msgstr "Vérifier si les chemins censés être circulaires sont fermés." +msgstr "Vérifier si les chemins circulaires sont fermés." #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:72 @@ -5366,10 +5371,10 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:69 msgid "Has tag containing ''fixme'' or ''FIXME''" -msgstr "A une attribut contenant « fixme » ou « FIXME »" +msgstr "A un attribut contenant « fixme » ou « FIXME »" #. translation note: don't translate quoted words #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:79 msgid "Has key ''note'' or ''comment'' or ''description''" -msgstr "A une clé \"note\", \"comment\" ou \"description\"" +msgstr "" #. translation note: don't translate quoted words @@ -5422,5 +5427,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:31 msgid "Wrongly Ordered Ways." -msgstr "Chemins mal ordonnés." +msgstr "Chemins mal ordonnés" #: ../core/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java:32 @@ -5456,5 +5461,5 @@ #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:52 msgid "Wrong number of arguments for bookmark" -msgstr "Nombre d'argument invalide pour le signet" +msgstr "Nombre d’argument invalide pour le signet" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:116 @@ -5465,5 +5470,5 @@ #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" -msgstr "Erreur : Ligne ''{0}'' inattendue dans le fichier des signets ''{1}''" +msgstr "Erreur : ligne ''{0}'' inattendue dans le fichier des signets ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:146 @@ -5544,6 +5549,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5658,8 +5663,8 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:31 msgid "Imagery offset" -msgstr "Décalage de l'imagerie" +msgstr "Décalage de l’imagerie" #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Imagerie" @@ -5758,10 +5763,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 msgid "Username" -msgstr "Nom d’utilisateur" +msgstr "Nom d’utilisateur :" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:110 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 msgid "Password" -msgstr "Mot de passe" +msgstr "Mot de passe :" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78 @@ -5819,5 +5824,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91 msgid "Set the language" -msgstr "Définissez la langue" +msgstr "Choisissez une langue" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92 @@ -5920,5 +5925,5 @@ msgstr "L’option {0} a été supprimée car elle n’est plus utilisée." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5926,10 +5931,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Affichage" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5937,11 +5942,11 @@ msgstr "Outils" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 msgid "Presets" -msgstr "Balises" - -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +msgstr "Modèles" + +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5952,5 +5957,5 @@ msgstr "Menu : {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6028,5 +6033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102 msgid "The (compass) heading of the line segment being drawn." -msgstr "Orientation du segment de chemin." +msgstr "Orientation du segment de chemin" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103 @@ -6093,5 +6098,5 @@ #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 msgid "unset: do not set this property on the selected objects" -msgstr "vide : ne pas utiliser cet attribut sur les objets sélectionnés" +msgstr "vide : ne pas utiliser cette propriété sur les objets sélectionnés" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150 @@ -6337,5 +6342,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" -msgstr "Pas de conflit de propriétés" +msgstr "Pas de conflit d’attributs" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 @@ -6345,5 +6350,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" -msgstr "Des conflits de propriété sont en attente de résolution" +msgstr "Des conflits d’attributs sont en attente de résolution" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 @@ -6357,14 +6362,16 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" -msgstr "" -"Les primitives suivantes ne peuvent pas être copiées sur une primitive " -"cible
parce qu’elles ont été supprimées du jeu de données cible :" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" +msgstr "" +"Les objets suivants ne peuvent pas être copiées sur un objet cible
parce " +"qu’ils ont été supprimés du jeu de données cible :" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" -msgstr "La fusion des primitives supprimées a échoué" +#, fuzzy +msgid "Merging deleted objects failed" +msgstr "La fusion des objets supprimés a échoué" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 @@ -6642,5 +6649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" -msgstr "Etat supprimé :" +msgstr "État supprimé :" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 @@ -6648,8 +6655,10 @@ msgstr "Référencé par :" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(aucun)" @@ -6689,7 +6698,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" -msgstr "Primitive" +msgstr "Objet" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121 @@ -6741,5 +6749,5 @@ #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:194 msgid "Key" -msgstr "Clé" +msgstr "Clé :" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 @@ -6758,5 +6766,5 @@ #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:194 msgid "Value" -msgstr "Valeur" +msgstr "Valeur :" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99 @@ -6796,5 +6804,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:132 msgid "Conflicts when combining primitives" -msgstr "Conflits lors de la combinaison de primitives" +msgstr "Conflits lors de la combinaison des objets" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:136 @@ -6927,6 +6935,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6937,5 +6945,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6994,5 +7002,5 @@ msgctxt "tag" msgid "Key:" -msgstr "Attribut" +msgstr "Clé :" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107 @@ -7094,5 +7102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255 msgid "Open the list of changesets in the current layer." -msgstr "Ouvrir la liste des groupes de modifications" +msgstr "Afficher la liste des groupes de modifications" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300 @@ -7145,7 +7153,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:73 msgid "Open a list of all commands (undo buffer)." -msgstr "Ouvrir la pile des commandes" - -#. create MapDust GUI +msgstr "Afficher la pile des commandes" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7156,5 +7163,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7162,7 +7169,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7178,9 +7186,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374 msgid "Undo the selected and all later commands" -msgstr "Annule la commande sélectionnée et toutes les suivantes" +msgstr "Annuler la commande sélectionnée et les suivantes" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:380 msgid "Redo the selected and all earlier commands" -msgstr "Refaire la commande sélectionnée et toutes les précédentes" +msgstr "Répéter la commande sélectionnée et les précédentes" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 @@ -7193,14 +7201,14 @@ msgstr "Conflits : {0} non résolu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Résoudre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" "Ouvrir une fenêtre de fusion pour les éléments sélectionnés dans la liste" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7407,5 +7415,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:289 msgid "Reload all currently selected objects and refresh the list." -msgstr "Recharger les objets sélectionnés et rafraîchir la liste." +msgstr "Actualiser la liste et les objets sélectionnés" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:328 @@ -7420,5 +7428,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:63 msgid "Advanced object info" -msgstr "Information avancées de l'objet" +msgstr "Informations avancées sur l’objet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:72 @@ -7488,9 +7496,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:174 msgid "Open a list of all loaded layers." -msgstr "Ouvrir la liste des calques chargés" +msgstr "Afficher la liste des calques" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321 msgid "Delete the selected layers." -msgstr "Supprimer le calque." +msgstr "Supprimer le calque" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:402 @@ -7501,5 +7509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:415 msgid "Toggle visible state of the selected layer." -msgstr "Afficher/Masquer le calque." +msgstr "Afficher/Masquer le calque" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475 @@ -7522,5 +7530,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:647 msgid "Merge this layer into another layer" -msgstr "Fusionner le calque avec une autre" +msgstr "Fusionner le calque avec un autre" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:701 @@ -7554,32 +7562,32 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:40 msgid "Information about layer" -msgstr "Informations à propos du calque." +msgstr "Informations sur le calque" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:48 msgid "Map Paint Styles" -msgstr "Coloriage de la carte" +msgstr "Coloriage" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87 msgid "configure the map painting style" -msgstr "" +msgstr "Configurer le coloriage de la carte" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88 msgid "MapPaint" -msgstr "" +msgstr "MapPaint" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304 msgid "Turn selected styles on or off" -msgstr "Activer ou déactiver les styles sélectionnés" +msgstr "Activer/Désactiver les modèles sélectionnés" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850 msgid "Move the selected entry one row down." -msgstr "Déplace l'entrée sélectionnée d'un rang vers le bas." +msgstr "Monter le modèle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850 msgid "Move the selected entry one row up." -msgstr "Déplace l'entrée sélectionnée d'un rang vers le haut." +msgstr "Descendre le modèle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:383 @@ -7611,26 +7619,26 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:543 msgid "view meta information, error log and source definition" -msgstr "" +msgstr "voir les métadonnées, le journal d'erreur et le paramètre de la source" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:554 msgid "Map Style info" -msgstr "" +msgstr "Informations sur le modèle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:581 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" -msgstr "Source" +msgstr "Source :" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:605 msgid "Title:" -msgstr "Titre:" +msgstr "Titre :" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:607 msgid "URL:" -msgstr "URL :" +msgstr "URL :" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609 msgid "Built-in Style, internal path:" -msgstr "" +msgstr "Emplacement du modèle :" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611 @@ -7640,13 +7648,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:614 msgid "Icon:" -msgstr "Icône:" +msgstr "Icône :" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:617 msgid "Background:" -msgstr "" +msgstr "Arrière-plan :" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 msgid "Style is currently active?" -msgstr "Le style est actuellement actif ?" +msgstr "Modèle actuellement actif ?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 @@ -7667,5 +7675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 msgid "Open a list of all relations." -msgstr "Ouvrir la liste des relations" +msgstr "Afficher la liste des relations" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:280 @@ -7684,5 +7692,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1442 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" +msgstr "Copier et modifier la relation" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434 @@ -7728,9 +7736,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166 msgid "Open a selection list window." -msgstr "Ouvrir la liste de sélection" +msgstr "Afficher la liste de sélection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304 msgid "Search for objects" -msgstr "Rechercher les objets" +msgstr "Rechercher des objets" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358 @@ -7781,5 +7789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:897 msgid "Get detailed information on the internal state of the objects." -msgstr "Obtenir les informations détaillées sur l'état interne des objets." +msgstr "Obtenir les informations détaillées sur l’état des objets." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:898 @@ -7801,13 +7809,13 @@ msgstr "Réduire/Agrandir le panneau" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Auteurs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." -msgstr "Ouvrir la liste des personnes travaillant sur la sélection" +msgstr "Afficher la liste des personnes travaillant sur la sélection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:162 @@ -7819,6 +7827,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" -msgstr "Sélectionner les primitives envoyées par cet utilisateur" +#, fuzzy +msgid "Select objects submitted by this user" +msgstr "Sélectionner les objets envoyés par cet utilisateur" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:213 @@ -7856,7 +7865,6 @@ "agreed to the new contributor terms will show a green check mark." msgstr "" -"Charge les informations sur le statut de la nouvelle licence. Les " -"utilisateurs ayant accepté les nouvelles conditions pour les contributeurs " -"verront une marque verte." +"Afficher les informations sur le statut de la nouvelle licence. Les " +"utilisateurs ayant accepté les nouvelles conditions seront marqués." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:322 @@ -7885,11 +7893,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:91 msgid "Open the validation window." -msgstr "Ouvrir la fenêtre de validation" +msgstr "Afficher la fenêtre de validation" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:97 msgid "Zoom to problem" -msgstr "Zoomer sur le problème" +msgstr "Zoomer sur le conflit" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Réparer" @@ -7909,5 +7918,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228 msgid "Single elements" -msgstr "Eléments seuls" +msgstr "Éléments seuls" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228 @@ -7917,9 +7926,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:229 msgid "Ignore whole group or individual elements?" -msgstr "Ignorer le groupe complet ou les éléments individuels ?" +msgstr "Voulez-vous ignorer le groupe complet ou les éléments individuels ?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:230 msgid "Ignoring elements" -msgstr "Les éléments sont ignorés" +msgstr "Sélectionnez les éléments ignorés" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:529 @@ -8120,6 +8129,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "Télécharger et afficher l’historique des primitives sélectionnées" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "Télécharger et afficher l’historique des objets sélectionnés" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -8130,5 +8140,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317 msgid "Select the corresponding primitives in the current data layer" -msgstr "Sélectionner les primitives correspondant" +msgstr "Sélectionner les objets correspondants" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324 @@ -8159,6 +8169,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "Zoomer sur les primitives correspondantes dans le calque" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "Zoomer sur les objets correspondants dans le calque" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 @@ -9279,5 +9290,5 @@ "Select the primitives in the content of this changeset in the current data " "layer" -msgstr "Sélectionner les primitives du groupe de modifications" +msgstr "Sélectionner les objets du groupe de modifications" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365 @@ -9292,8 +9303,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" -msgstr "Zoomer sur les primitives du groupe de modifications" +msgstr "Zoomer sur les objets du groupe de modifications" #. parent for dialog is Main.parent @@ -9403,6 +9415,6 @@ "is anonymous" msgstr "" -"Impossible de limiter la requête sur le groupes de modifications à " -"l'utilisateur actuel car il est anonyme" +"Impossible de limiter la requête du groupe de modifications à l'utilisateur " +"actuel car il est anonyme" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533 @@ -9469,5 +9481,5 @@ "valid." msgstr "" -"Impossible de limiter la requête sur le groupe de modifications à des plages " +"Impossible de limiter la requête du groupe de modifications à des plages " "horaires. Les données ne sont pas valides." @@ -9489,5 +9501,5 @@ "invalid." msgstr "" -"Impossible de restreindre la requête du groupe de modification à une zone " +"Impossible de limiter la requête du groupe de modification à une zone " "délimitée. Les données sont invalides." @@ -9813,6 +9825,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Ouvrir la page d’aide du wiki dans le navigateur" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9865,8 +9877,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"La relation enfant
{0}
est supprimée sur le serveur et ne peut " -"être chargée." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9957,17 +9967,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" "Cette relation possède déjà un ou plusieurs membres se rapportant " -"à
la primitive ''{0}''
Voulez-vous vraiment un ajouter un autre membre " -"à la relation ?" +"à
l’objet ''{0}''
Voulez-vous vraiment un ajouter un autre membre à la " +"relation ?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" -msgstr "Plusieurs membres se rapportent à la même primitive" +#, fuzzy +msgid "Multiple members referring to same object." +msgstr "Plusieurs membres se rapportent au même objet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:699 @@ -9983,31 +9994,31 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" -msgstr "Ajouter les primitives sélectionnées devant le premier membre" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "Ajouter les objets sélectionnés devant le premier membre" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -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" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "Ajouter les objets sélectionnés après le dernier membre" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" -msgstr "" -"Ajouter les primitives sélectionnées devant le premier membre sélectionné" +msgstr "Ajouter les objets sélectionnés devant le premier membre sélectionné" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" -msgstr "" -"Ajouter les primitives sélectionnées après le dernier membre sélectionné" +msgstr "Ajouter les objets sélectionnés après le dernier membre sélectionné" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" -"Supprimer les membres se rapportant à l’une des primitives sélectionnées" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Supprimer les membres se rapportant à l’un des objets sélectionnés" #. putValue(NAME, tr("Remove Selected")); @@ -10018,22 +10029,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" -msgstr "" -"Sélectionner les membres de la relation se rapportant aux primitives dans la " +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" +msgstr "" +"Sélectionner les membres de la relation se rapportant aux objets dans la " "sélection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" -msgstr "" -"Sélectionner les membres de la relation se rapportant à {0} primitives dans " -"la sélection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" +msgstr "" +"Sélectionner les membres de la relation se rapportant à {0} objets dans la " +"sélection" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "Sélectionner les primitives correspondant aux membres de la relation" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Sélectionner les objets correspondants aux membres de la relation" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -10063,5 +10074,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996 msgid "Move the currently selected members up" -msgstr "Déplacer les membres sélectionnés vers le haut" +msgstr "Monter les membres sélectionnés" #. putValue(NAME, tr("Move Up")); @@ -10072,5 +10083,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1015 msgid "Move the currently selected members down" -msgstr "Déplacer les membres sélectionnés vers le bas" +msgstr "Descendre les membres sélectionnés" #. putValue(NAME, tr("Move Down")); @@ -10131,10 +10142,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"Le calque ''{0}'' a déjà un conflit pour la primitive
''{1}''." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" +"Le calque ''{0}'' a déjà un conflit pour l’objet
''{1}''." "
Veuillez d’abord résoudre ce conflit puis réessayer." @@ -10178,5 +10190,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367 msgid "Sets a role for the selected members" -msgstr "Définir le rôle pour le membre sélectionné" +msgstr "Définir le rôle" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369 @@ -10185,13 +10197,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." -msgstr[0] "Vous avez défini un rôle vide pour {0} primitive." -msgstr[1] "Vous avez défini un rôle vide pour {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." +msgstr[0] "Vous avez défini un rôle vide pour {0} objet." +msgstr[1] "Vous avez défini un rôle vide pour {0} objets." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." -msgstr "Èquivalent à suppimer les rôles de ces primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." +msgstr "Ceci est équivalent à supprimer les rôles de ces objets." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 @@ -10265,5 +10278,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62 msgid "including immediate children of parent relations" -msgstr "inclure les enfants des relations parentes" +msgstr "Inclure les enfants des relations parentes" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90 @@ -10296,5 +10309,5 @@ #, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Modifier la relation N°{0} dans le calque \"{1}" +msgstr "Modifier la relation n°{0} dans le calque \"{1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:116 @@ -10366,5 +10379,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254 msgid "Name of location" -msgstr "Nom du lieu" +msgstr "Nom du signet" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217 @@ -10378,17 +10391,17 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105 msgid "min lat" -msgstr "lat min" +msgstr "lat min :" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107 msgid "min lon" -msgstr "lon min" +msgstr "lon min :" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "max lat" -msgstr "lat max" +msgstr "lat max :" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 msgid "max lon" -msgstr "lon max" +msgstr "lon max :" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114 @@ -10402,5 +10415,5 @@ msgstr "" "URL provenant d’openstreetmap.org (vous pouvez coller ici l’URL de la zone à " -"télécharger)" +"télécharger) :" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155 @@ -10442,5 +10455,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99 msgid "Select to download OSM data in the selected download area." -msgstr "Télécharger les données OSM de la zone sélectionnée." +msgstr "Télécharger les données OSM de la zone sélectionnée" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:101 @@ -10485,6 +10498,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Télécharger la zone sélectionnée" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10496,18 +10509,15 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Ni {0} ni {1} n’est coché." -"
Veuillez choisir le téléchargement des données OSM, des données GPX, ou " -"des deux." +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 msgid "Class Type" -msgstr "Type de classe" +msgstr "Classe" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:145 msgid "Bounds" -msgstr "Limites" +msgstr "Limites :" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75 @@ -10522,13 +10532,13 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102 msgid "Choose the server for searching:" -msgstr "Choisir le serveur pour la recherche :" +msgstr "Serveur de recherche :" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:110 msgid "Enter a place name to search for:" -msgstr "Entrer le nom du lieu à rechercher :" +msgstr "Nom du lieu à rechercher :" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:113 msgid "Enter a place name to search for" -msgstr "Entrer le nom du lieu à rechercher" +msgstr "saisir le nom du lieu à rechercher" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:149 @@ -10547,5 +10557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:289 msgid "Click to start searching for places" -msgstr "Commencer la recherche" +msgstr "Lancer la recherche" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:329 @@ -10581,4 +10591,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10644,5 +10655,5 @@ #: build/trans_presets.java:2544 msgid "unknown" -msgstr "inconnue" +msgstr "inconnu" #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:37 @@ -10664,5 +10675,6 @@ msgstr "Navigateur d’aide de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10670,17 +10682,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

Contenu d’aide pour sujet manquant

Un contenu d’aide pour le sujet {0} " -"n’est pas encore disponible ni dans votre langue ({1}) ni en anglais." -"
Merci d’améliorer le système d’aide de JOSM en remplissant les " -"informations manquantes. Vous pouvez modifier l’aide dans " -"votre langue ({1}) et l’aide en anglais.

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10695,5 +10701,5 @@ "traduit) :
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10704,19 +10710,19 @@ "à un problème de réseau, veuillez vérifier
votre connexion Internet" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "mpossible d’ouvrir l’URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Ouvrir la page d’aide dans un navigateur externe" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Modifier la page d’aide" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10729,33 +10735,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Recharger la page" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Avancer d’une page" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Reculer d’une page" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Ouvrir la page d’aide de la page d’accueil de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Attention : mauvais emplacement dans le document HTML. Exception : {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Impossible d’ouvrir la page d’aide. L’URL cible est vide." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Impossible d’ouvrir la page d’aide." @@ -10796,5 +10802,5 @@ msgstr "" "L’historique n’est pas encore initialisé. Impossible de définir la référence " -"de la primitive." +"de l’objet." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274 @@ -10818,6 +10824,5 @@ msgid "History not initialized yet. Failed to set current primitive." msgstr "" -"L'historique n'est pas encore initialisé. Impossible de définir la primitive " -"actuelle." +"L'historique n'est pas encore initialisé. Impossible de définir l’objet." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 @@ -10827,6 +10832,6 @@ "history." msgstr "" -"impossible de définir l’en-cours. la version actuelle {0} n’est pas " -"disponible dans l’historique" +"impossible de définir l’objet. La version actuelle {0} n’est pas disponible " +"dans l’historique." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55 @@ -10878,4 +10883,8 @@ msgstr "Relation {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objet" + #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 @@ -10904,5 +10913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120 msgid "Changeset info" -msgstr "Informations sur le groupe de modifications" +msgstr "Information sur le groupe de modifications" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121 @@ -10949,6 +10958,4 @@ "Failed to update primitive with id {0} because current edit layer is null" msgstr "" -"La mise à jour de la primitive avec l’identifiant {0} a échoué car le calque " -"est nul" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65 @@ -10958,11 +10965,11 @@ "include such a primitive" msgstr "" -"La mise à jour de la primitive avec l’identifiant {0} a échoué car le calque " -"ne contient pas cette primitive" +"La mise à jour de l’objet avec l’identifiant {0} a échoué car le calque ne " +"contient pas cette primitive" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94 #, java-format msgid "Synchronize node {0} only" -msgstr "Synchroniser uniquement le nœud {0}" +msgstr "Synchroniser le nœud {0}" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95 @@ -10979,5 +10986,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154 msgid "Synchronize entire dataset" -msgstr "Synchroniser tout le jeu de données" +msgstr "Synchroniser toutes les données" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118 @@ -10993,15 +11000,15 @@ msgstr "" "L’envoi a échoué car le serveur possède une version " -"plus récente de l’un de vos nœuds, chemins ou relations.
Le conflit vient " +"plus récente dl’un de vos nœuds, chemins ou relations.
Le conflit vient " "de {0} avec l’identifiant {1},
le " "serveur a la version {2}, votre version est {3}.
Cliquez sur {4} pour synchroniser uniquement la primitive en conflit.
Cliquez sur " -"{5} pour synchroniser le jeu de données avec le serveur." -"
Cliquez sur {6} pour annuler et continuer les " -"modifications.
" +"strong> pour synchroniser uniquement l’objet en conflit.
Cliquez sur " +"{5} pour synchroniser tout le jeu de données.
Cliquez " +"sur {6} pour annuler et continuer les modifications.
" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Conflits détectés" @@ -11075,5 +11082,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49 msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Ajoutez un commentaire sur les modifications que vous envoyez :" +msgstr "Ajoutez un commentaire sur vos modifications :" #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51 @@ -11134,5 +11141,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:146 msgid "Select to close the changeset after the next upload" -msgstr "Cocher pour fermer le groupe de modifications après le prochain envoi" +msgstr "Fermer le groupe de modifications après le prochain envoi" #. putValue(NAME, tr("Reload")); @@ -11185,9 +11192,9 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105 msgid "Enter credentials for OSM API" -msgstr "Entrer vos références pour l’API OSM" +msgstr "Identification OSM" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112 msgid "Enter credentials for HTTP proxy" -msgstr "Entrer vos références pour le proxy HTTP" +msgstr "Identification par proxy HTTP" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 @@ -11197,9 +11204,9 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237 msgid "Please enter the user name of your OSM account" -msgstr "Saisissez votre nom d’utilisateur pour le compte OSM" +msgstr "Saisissez votre nom d’utilisateur OSM" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238 msgid "Please enter the password of your OSM account" -msgstr "Entrez le mot de passe de votre compte OSM" +msgstr "Entrez votre mot de passe OSM" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240 @@ -11250,5 +11257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280 msgid "Authenticate with the supplied username and password" -msgstr "Authentification avec le nom d’utilisateur et mot de passe fournis" +msgstr "S’identifier avec le nom d’utilisateur et le mot de passe" #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293 @@ -11655,5 +11662,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371 msgid "Upload the changed primitives" -msgstr "Envoyer les primitives modifiées" +msgstr "Envoyer les objets modifiés" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:380 @@ -11667,5 +11674,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:381 msgid "Continue as is" -msgstr "Continuer tel quel" +msgstr "Continuer" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383 @@ -11677,37 +11684,34 @@ "explain your change, you will make life
easier for many other mappers." msgstr "" -"Le commentaire de votre envoi est vide, ou très court.

Cela est techniquement autorisé, mais sachez que de nombreux " -"utilisateurs qui
surveillent les changements dans leur zone comptent " -"beaucoup sur les commentaires pertinents
décrivant ce qui se passe !" -"

Si vous prenez 1 minute de votre temps pour expliquer votre " -"changement, vous rendrez la vie
plus facile pour de nombreux autres " -"membres." +"Le commentaire de votre envoi est vide ou très court.

Cela est autorisé, mais sachez que de nombreux utilisateurs
surveillent les modifications dans leur zone et apprécient les commentaires " +"
décrivant ce qui se passe !

Prenez une minute pour " +"expliquer vos modifications, vous rendrez ainsi la vie
plus facile pour " +"les autres utilisateurs." #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:398 msgid "Return to the previous dialog to enter a more descriptive comment" -msgstr "" -"Revenir à la boîte de dialogue précédente pour entrer un commentaire plus " -"descriptif" +msgstr "Revenir à la fenêtre précédente et ajouter un commentaire" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:399 msgid "Cancel and return to the previous dialog" -msgstr "Annuler et revenir à la boîte de dialogue précédente" +msgstr "Annuler et revenir à la fenêtre précédente" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:400 msgid "Ignore this hint and upload anyway" -msgstr "Ignorer ce conseil et envoyer quand même" +msgstr "Ignorer ce conseil et envoyer" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:403 msgid "Do not show this message again" -msgstr "Ne plus afficher ce message" +msgstr "Ne plus afficher" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 msgid "Please enter a valid chunk size first" -msgstr "Entrez d’abord une taille de bloc valide" +msgstr "Entrez d’abord une taille valide" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:412 msgid "Illegal chunk size" -msgstr "Taille de bloc erronée" +msgstr "Taille erronée" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448 @@ -11718,20 +11722,22 @@ #, java-format msgid "Tags of changeset {0}" -msgstr "Attributs de la session de modification {0}" +msgstr "Attributs du groupe de modifications {0}" #. we tried to delete an already deleted primitive. #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Attention : la primitive \"{0}\" est déjà supprimée sur le serveur. Elle " -"sera ignoré pour compléter l’envoi." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Attention : l’objet \"{0}\" est déjà supprimé sur le serveur. Il sera ignoré " +"pour compléter l’envoi." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "Préparation des primitives à envoyer..." +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Préparation des objets à envoyer..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11752,11 +11758,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55 msgid "The changeset is going to be closed after this upload" -msgstr "" -"Le groupe de modifications sera fermé après cet envoi/" +msgstr "Le groupe de modifications sera fermé après l’envoi." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57 msgid "The changeset is left open after this upload" msgstr "" -"Le groupe de modifications restera ouvert après cet envoi." +"Le groupe de modifications restera ouvert après l’envoi." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59 @@ -11770,9 +11775,9 @@ "Uploading {0} objects to 1 changeset" msgstr[0] "" -"Envoi d’{0} objet vers un groupe de modifications" +"{0} objet sera envoyé vers un groupe de " +"modifications." msgstr[1] "" -"Envoi de {0} objets vers un groupe de " -"modifications" +"{0} objets seront envoyés vers un groupe de " +"modifications." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87 @@ -11785,8 +11790,8 @@ "1 request" msgstr[0] "" -"Envoi d’{0} objet vers un groupe de modifications via une requête" +"{0} objet sera envoyé vers un groupe de " +"modifications via une requête." msgstr[1] "" -"Envoi de {0} objets vers un groupe de " +"{0} objets seront envoyés vers un groupe de " "modifications via une requête" @@ -11797,6 +11802,6 @@ "{1} requests" msgstr "" -"Envoi de {0} objets vers un groupe de " -"modifications via {1} requêtes" +"{0} objets seront envoyés vers un groupe de " +"modifications via {1} requêtes." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94 @@ -11823,6 +11828,6 @@ "strong> using {1} requests" msgstr "" -"Envoi de {0} objets vers plusieurs groupes de " -"modifications via {1} requêtes" +"{0} objets seront envoyés vers plusieurs groupes de " +"modifications via {1} requêtes." #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67 @@ -11892,15 +11897,4 @@ msgstr "Le groupe de modifications est plein" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Attention : l’objet \"{0}\" est déjà supprimé sur le serveur. Il sera ignoré " -"pour compléter l’envoi." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11909,5 +11903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11927,5 +11921,5 @@ msgstr "" "Marquer les objets modifiés de la sélection devant " -"être envoyés vers le serveur." +"être envoyés vers le serveur :" #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70 @@ -11934,6 +11928,6 @@ "server." msgstr "" -"Marquer les objets supprimés localement comme étant à " -"supprimer sur le serveur." +"Marquer les objets supprimés localement devant être " +"supprimés sur le serveur :" #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112 @@ -11963,5 +11957,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131 msgid "Upload data in chunks of objects. Chunk size: " -msgstr "Envoyer en plusieurs parties. Taille du morceau : " +msgstr "Envoyer en plusieurs morceaux. Taille du bloc : " #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158 @@ -11980,5 +11974,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191 msgid "Fill up one changeset and return to the Upload Dialog" -msgstr "Remplir un groupe de modifications et rouvrir la fenêtre d’envoi" +msgstr "" +"Remplir un groupe de modifications et retourner à la la fenêtre d’envoi" #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193 @@ -12034,5 +12029,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "Taille de bloc erronée <= 0. Veuillez entrer un entier > 1" +msgstr "Taille erronée <= 0. Veuillez entrer un entier > 1" #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 @@ -12041,5 +12036,5 @@ msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" msgstr "" -"la taille de bloc {0} dépasse la taille maximale pour un groupe de " +"La taille du bloc {0} dépasse la taille maximale pour le groupe de " "modification {1}, pour le serveur ''{2}''" @@ -12119,4 +12114,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12198,5 +12194,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12316,5 +12312,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1263 msgid "Draw lines between points for this layer." -msgstr "Dessiner des lignes entre les points pour ce calque." +msgstr "Tracer des lignes entre les points pour ce calque." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1244 @@ -12322,5 +12318,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1264 msgid "Do not draw lines between points for this layer." -msgstr "Ne pas dessiner de ligne entre les points pour ce calque." +msgstr "Ne pas tracer de ligne entre les points pour ce calque." #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258 @@ -12416,5 +12412,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:171 msgid "(use server offset)" -msgstr "" +msgstr "(utiliser un serveur pour le décalage)" #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:243 @@ -12422,19 +12418,19 @@ msgstr "ERREUR" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Calque de données {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -12442,18 +12438,18 @@ "0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Il y avait {0} conflit détecté." -msgstr[1] "Il y avait {0} conflits détectés." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +msgstr[0] "{0} conflit a été détecté." +msgstr[1] "{0} conflits ont été détectés." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Fermer la fenêtre et continuer les modifications" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12462,32 +12458,32 @@ msgstr[1] "{0} supprimés" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "vide" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Convertir en calque GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Test de cohérence du jeu de données" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Pas de problème trouvé." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Les problèmes suivants ont été trouvés:" @@ -12549,5 +12545,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:360 msgid "Show Tile Info" -msgstr "Monter les informations sur la tuile." +msgstr "Afficher l’information de la tuile" #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:383 @@ -12929,10 +12925,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988 msgid "The selected photos do not contain time information." -msgstr "" -"Les photos sélectionnées ne contiennent pas d’information d’horodatage." +msgstr "Les photos sélectionnées ne contiennent pas d’horodatage." #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989 msgid "Photos do not contain time information" -msgstr "Les photos ne contienne tpas d’information d’horodatage" +msgstr "Les photos ne contiennent pas d’horodatage" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017 @@ -12984,5 +12979,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:115 msgid "One of the selected files was null" -msgstr "Un des fichiers sélectionnés était vide." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:120 @@ -13247,6 +13242,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13270,13 +13265,13 @@ "right click menu for details." msgstr[0] "" -"Erreur au chargement du style. Cliquez sur \"informations\" dans le menu du " -"clic droit pour plus d'informations." +"Il y a eu une erreur durant le chargement du modèle. Cliquez sur " +"\"Informations\" pour plus de détails." msgstr[1] "" -"{0} erreurs au chargement du style. Cliquez sur \"informations\" dans le " -"menu du clic droit pour plus d'informations." - -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +"Il y a eu {0} erreurs durant le chargement du modèle. Cliquez sur " +"\"Informations\" pour plus de détails." + +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13293,5 +13288,5 @@ msgstr "Le motif est erroné, au moins une valeur doit être positive" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13341,14 +13336,14 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78 msgid "Request Token URL:" -msgstr "URL de requête d’autorisation" +msgstr "URL de requête d’autorisation :" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89 msgid "Access Token URL:" -msgstr "URL de autorisation d’accès :" +msgstr "URL de l’autorisation d’accès :" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236 msgid "Authorize URL:" -msgstr "Autoriser l'URL :" +msgstr "URL d’autorisation :" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 @@ -13374,5 +13369,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58 msgid "Fully automatic" -msgstr "Entièrement automatique" +msgstr "Automatique" #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61 @@ -13391,5 +13386,5 @@ "html>" msgstr "" -"Lancer une procédure automatisée pour obtenir une autorisation d’accès " +"Lancer une procédure automatique pour obtenir une autorisation d’accès " "depuis le site OSM.
JOSM accède au site OSM sous le nom de l’utilisateur, " "
autorise l’utilisateur et récupère l’autorisation d’accès." @@ -13403,5 +13398,5 @@ "submitted by JOSM." msgstr "" -"Lancer une procédure semi-automatisée pour obtenir une autorisation " +"Lancer une procédure semi-automatique pour obtenir une autorisation " "d’accès depuis le site OSM.
JOSM transmet les demandes OAuth afin " "d’obtenir une autorisation de requête et une
autorisation d’accès. Il " @@ -13428,5 +13423,5 @@ "passe ne sera pas enregistré en clair dans les préférences " "et il sera transmis au serveur OSM une seule fois. Les " -"requêtes pour l’envoi des données n’utilisent plus votre mot de passe." +"requêtes pour l’envoi des données n’utiliseront plus votre mot de passe." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111 @@ -13536,5 +13531,5 @@ "authorization process,
i.e. semi-automatic or manual authorization." msgstr "" -"Le processus automatisé pour récupérer l’autorisation d’accès " +"Le processus automatique pour récupérer l’autorisation d’accès " "OAuth
depuis le serveur OSM a échoué.
Veuillez réessayer ou choisir " "une autre méthode d’authentification,
par exemple semi-automatique or " @@ -13555,5 +13550,5 @@ "advanced setting and try again." msgstr "" -"Le processus automatisé pour récupérer l’autorisation d’accès " +"Le processus automatique pour récupérer l’autorisation d’accès " "OAuth
à partir du serveur OSM a échoué parce que JOSM n’a pas été capable " "de construire
une URL de connexion valide à partir de l’URL OAuth ''{0}''." @@ -13567,5 +13562,5 @@ "

Please check username and password and try again." msgstr "" -"Le processus automatisé pour récupérer l’autorisation d’accès " +"Le processus automatique pour récupérer l’autorisation d’accès " "OAuth
depuis le serveur OSM a échoué. JOSM n’a pas pu se connecter à {0}" "
pour l’utilisateur {1}.
Veuillez vérifier le nom d’utilisateur et le " @@ -13594,5 +13589,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121 msgid "Enter the OAuth Access Token" -msgstr "Entrer une autorisation d’accès OAuth" +msgstr "Entrer l’autorisation d’accès OAuth" #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122 @@ -13617,6 +13612,6 @@ "The Access Token Key must not be empty. Please enter an Access Token Key" msgstr "" -"La clé pour l’autorisation d’accès ne doit pas être vide. Veuillez entrer " -"une clé pour l’autorisation d’accès" +"La clé de l’autorisation d’accès ne doit pas être vide. Veuillez entrer une " +"clé pour l’autorisation d’accès" #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197 @@ -13629,5 +13624,5 @@ "Secret" msgstr "" -"Le secret pour l’autorisation d’accès ne doit pas être vide. Veuillez entrer " +"Le secret de l’autorisation d’accès ne doit pas être vide. Veuillez entrer " "un secret pour l’autorisation d’accès" @@ -13643,6 +13638,6 @@ "your behalf (more info...)." msgstr "" -"Avec OAuth, vous autorisez JOSM à envoyer les données de la carte et les " -"traces GPS sous votre nom (plus d’infos...)." +"Avec OAuth, vous autorisez JOSM à envoyer les données et les traces GPS " +"sous votre nom (plus d’infos...)." #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126 @@ -13657,9 +13652,9 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344 msgid "Close the dialog and cancel authorization" -msgstr "Fermer la fenêtre et annuler l’autorisation" +msgstr "Annuler l’autorisation et fermer la fenêtre" #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363 msgid "Close the dialog and accept the Access Token" -msgstr "Fermer la fenêtre et accepter l’autorisation d’accès" +msgstr "Accepter l’autorisation d’accès et fermer la fenêtre" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101 @@ -13722,21 +13717,21 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37 msgid "Allow to upload map data" -msgstr "Autoriser l'envoi des données de la carte" +msgstr "Autoriser l’envoi des données de la carte" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38 msgid "Select to grant JOSM the right to upload map data on your behalf" -msgstr "Cocher pour autoriser JOSM à envoyer les données sous votre nom" +msgstr "Autoriser JOSM à envoyer les données sous votre nom" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45 msgid "Allow to upload GPS traces" -msgstr "Autoriser l'envoi des traces GPS" +msgstr "Autoriser l’envoi des traces GPS" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46 msgid "Select to grant JOSM the right to upload GPS traces on your behalf" -msgstr "Cocher pour autoriser JOSM à envoyer les traces GPS sous votre nom" +msgstr "Autoriser JOSM à envoyer les traces GPS sous votre nom" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53 msgid "Allow to download your private GPS traces" -msgstr "Permettre de télécharger vos propres traces GPS" +msgstr "Autoriser le téléchargement de vos traces GPS" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54 @@ -13744,23 +13739,21 @@ "Select to grant JOSM the right to download your private GPS traces into JOSM " "layers" -msgstr "" -"Cocher pour autoriser JOSM a télécharger vos propres traces GPS dans les " -"calques JOSM" +msgstr "Autoriser JOSM à télécharger vos traces GPS dans les calques" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61 msgid "Allow to read your preferences" -msgstr "Permettre de lire vos préférences" +msgstr "Autoriser la lecture de vos préférences" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62 msgid "Select to grant JOSM the right to read your server preferences" -msgstr "Cocher pour autoriser JOSM à lire vos préférences" +msgstr "Autoriser JOSM à lire vos préférences" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69 msgid "Allow to write your preferences" -msgstr "Permettre d’écrire vos préférences" +msgstr "Autoriser l’écriture de vos préférences" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70 msgid "Select to grant JOSM the right to write your server preferences" -msgstr "Cocher pour autoriser JOSM à écrire vos préférences" +msgstr "Autoriser JOSM à écrire vos préférences" #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45 @@ -13889,6 +13882,6 @@ msgid "Retrieving user details with Access Token Key ''{0}'' was rejected." msgstr "" -"La récupération des détails de l’utilisateur avec la clé pour l’autorisation " -"d’accès ''{0}'' a échoué." +"La récupération des détails avec la clé pour l’autorisation d’accès ''{0}'' " +"a échoué." #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120 @@ -13896,6 +13889,6 @@ msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden." msgstr "" -"La récupération des détails de l’utilisateur avec la clé pour l’autorisation " -"d’accès ''{0}'' est interdite." +"La récupération des détails avec la clé pour l’autorisation d’accès ''{0}'' " +"est interdite." #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144 @@ -13987,5 +13980,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251 msgid "Retrieving user info..." -msgstr "Récupération des informations de l’utilisateur..." +msgstr "Récupération des informations sur l’utilisateur..." #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:79 @@ -14090,35 +14083,35 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34 msgid "Display the Audio menu." -msgstr "Afficher le menu Audio." +msgstr "Afficher le menu Audio" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35 msgid "Label audio (and image and web) markers." -msgstr "Étiqueter les marqueurs audio (image et web)." +msgstr "Étiqueter les marqueurs audio (image et web)" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36 msgid "Display live audio trace." -msgstr "Afficher la trace audio \"en direct\"." +msgstr "Afficher la trace audio en direct" #. various methods of making markers on import audio #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39 msgid "Explicit waypoints with valid timestamps." -msgstr "Points avec des horodatages valides." +msgstr "Points avec des horodatages valides" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40 msgid "Explicit waypoints with time estimated from track position." -msgstr "Points avec un horodatage estimé à partir de la position de la trace." +msgstr "Points avec un horodatage estimé à partir de la position de la trace" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41 msgid "Named trackpoints." -msgstr "Nommer les points de parcours." +msgstr "Nommer les points de parcours" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42 msgid "Modified times (time stamps) of audio files." -msgstr "Horodatage modifié des fichiers audio." +msgstr "Horodatage modifié des fichiers audio" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43 msgid "Start of track (will always do this if no other markers available)." msgstr "" -"Début de la trace (par défaut si aucun autre marqueur n’est disponible)." +"Début de la trace (par défaut si aucun autre marqueur n’est disponible)" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53 @@ -14130,7 +14123,5 @@ "Display a moving icon representing the point on the synchronized track where " "the audio currently playing was recorded." -msgstr "" -"Placer une icône sur le point où le fichier audio joué a été enregistré sur " -"la trace." +msgstr "Indiquer sur la trace le point où le fichier audio a été enregistré." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63 @@ -14138,10 +14129,9 @@ "Put text labels against audio (and image and web) markers as well as their " "button icons." -msgstr "" -"Placer un texte à côté des marqueurs audio (image et web) et de leurs icônes." +msgstr "Placer un texte à côté des marqueurs audio et de leurs icônes." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:66 msgid "When importing audio, make markers from..." -msgstr "Lors de l’import de fichiers audio, créer des marqueurs depuis :" +msgstr "Lors de l’import des fichiers audio, créer des marqueurs depuis :" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:70 @@ -14172,10 +14162,10 @@ "pressed" msgstr "" -"Nombre de secondes pour aller en avant ou en arrière lorsqu'on appui sur le " +"Nombre de secondes à sauter en avant ou en arrière lors de l’appui sur le " "bouton." #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95 msgid "Forward/back time (seconds)" -msgstr "Temps pour avancer/reculer (en secondes)" +msgstr "Temps pour avancer/reculer (secondes) :" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99 @@ -14185,5 +14175,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100 msgid "Fast forward multiplier" -msgstr "Multiplicateur d’avance rapide" +msgstr "Multiplicateur d’avance rapide :" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104 @@ -14196,5 +14186,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105 msgid "Lead-in time (seconds)" -msgstr "Délai (en secondes)" +msgstr "Délai (secondes) :" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109 @@ -14206,5 +14196,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110 msgid "Voice recorder calibration" -msgstr "Étalonnage de l’enregistrement de la voix" +msgstr "Étalonnage de la voix :" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:45 @@ -14214,5 +14204,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49 msgid "Auto save interval (seconds)" -msgstr "Interval de sauvegarde (en secondes)" +msgstr "Interval de sauvegarde (secondes) :" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52 @@ -14224,5 +14214,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56 msgid "Auto saved files per layer" -msgstr "Fichiers sauvegardés par calque" +msgstr "Fichiers sauvegardés par calque :" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:64 @@ -14232,8 +14222,7 @@ "tries to recover the unsaved changes on next start.)" msgstr "" -"(La sauvegarde automatique stocke les calques modifiés à intervalles " -"réguliers. Les sauvegardes sont enregistrées dans le dossier préférence de " -"JOSM. En cas de crash, JOSM tentera de récupérer les modifications non " -"enregistrées au lancement suivant.)" +"(La sauvegarde automatique enregistre à intervalles réguliers les calques " +"modifiés dans le dossier préférence de JOSM. En cas de crash, JOSM tentera " +"de récupérer les modifications non enregistrées au lancement suivant.)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72 @@ -14284,5 +14273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:170 msgid "Set to default" -msgstr "Mettre la valeur par défaut" +msgstr "Mettre la couleur par défaut" #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:181 @@ -14315,4 +14304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Aucun" @@ -14320,14 +14310,14 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 msgid "Force lines if no segments imported." -msgstr "Forcer les lignes si aucun segment n’est importé." +msgstr "Forcer les lignes si aucun segment n’est importé" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 msgid "Draw large GPS points." -msgstr "Dessiner de gros points GPS." +msgstr "Dessiner de gros points GPS" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:160 msgid "Draw a circle form HDOP value." -msgstr "Dessiner un cercle d’après les valeurs HDOP." +msgstr "Dessiner un cercle d’après les valeurs HDOP" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 @@ -14430,15 +14420,13 @@ msgstr "Dessin rapide (moins joli)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Seulement pour les directions intéressantes (sens unique par exemple)." - -#. only on the head of a way +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 +msgid "Only on the head of a way." +msgstr "Seulement à l’extrémité du chemin" + #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 -msgid "Only on the head of a way." -msgstr "Seulement à l’extrémité du chemin." +msgid "Draw oneway arrows." +msgstr "Dessiner les flèches des sens uniques" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14448,5 +14436,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57 msgid "Draw boundaries of downloaded data" -msgstr "Afficher les limites des données téléchargées" +msgstr "Tracer les limites des données téléchargées" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58 @@ -14464,9 +14452,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61 msgid "Create markers when reading GPX." -msgstr "Créer des marqueurs à la lecture du GPX." +msgstr "Créer des marqueurs à la lecture du GPX" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62 msgid "Draw only outlines of areas" -msgstr "Dessiner uniquement les limites des surfaces" +msgstr "Tracer uniquement les limites des surfaces" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63 @@ -14500,5 +14488,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:93 msgid "Draw lines between raw GPS points" -msgstr "Dessiner des lignes entre les points GPS" +msgstr "Tracer des lignes entre les points GPS" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:115 @@ -14512,5 +14500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117 msgid "Maximum length for local files (meters)" -msgstr "Longueur maximale des fichiers locaux (mètres)" +msgstr "Longueur maximale des fichiers locaux (mètres) :" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122 @@ -14523,5 +14511,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124 msgid "Maximum length (meters)" -msgstr "Longueur maximale (mètres)" +msgstr "Longueur maximale (mètres) :" #. forceRawGpsLines @@ -14531,5 +14519,5 @@ msgstr "" "Forcer le dessin des lignes si les données importées ne contiennent pas " -"d’information sur les lignes." +"d’information." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140 @@ -14556,5 +14544,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155 msgid "Minimum distance (pixels)" -msgstr "Distance minimale (pixels)" +msgstr "Distance minimale (pixels) :" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:165 @@ -14567,10 +14555,10 @@ "Layer Manager." msgstr "" -"Les segments et les points auront la même couleur. Elle est personnalisable " -"dans le Gestionnaire de calques" +"Colorier tous les segments et les points de la même couleur (personnalisable " +"dans le Gestionnaire de calques)." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193 msgid "Colors points and track segments by velocity." -msgstr "Colorie les segments et les points en fonction de la vitesse." +msgstr "Colorier les segments et les points en fonction de la vitesse." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194 @@ -14579,5 +14567,5 @@ "capture device needs to log that information." msgstr "" -"Colorie les segments et les points en fonction de l’atténuation de la " +"Colorier les segments et les points en fonction de l’atténuation de la " "précision (HDOP). Votre instrument doit enregistrer cette information." @@ -14592,5 +14580,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214 msgid "Allows to change the labelling of track waypoints." -msgstr "Autorise le changement du nommage des points du trajet." +msgstr "Autoriser le changement de précision des points du trajet." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:215 @@ -14602,25 +14590,30 @@ msgstr "Points GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Dessiner les flèches de direction pour les sections de chemin." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Afficher l’ordre de tous les segments des chemins." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Appliquer un anticrénelage aux contours de la carte." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." -msgstr "Afficher les limites des données téléchargées depuis le serveur." +msgstr "Tracer les limites des données téléchargées depuis le serveur" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14629,9 +14622,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Afficher les calques de données inactifs sous une autre couleur." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14641,5 +14634,5 @@ "sélectionné." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Données OSM" @@ -14675,5 +14668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:155 msgid "Use offset server: " -msgstr "" +msgstr "Utiliser un serveur pour le décalage : " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:177 @@ -14695,13 +14688,13 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:200 msgid "Simultaneous connections" -msgstr "Connexions simultanées" +msgstr "Connexions simultanées :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:216 msgid "Auto zoom by default: " -msgstr "Zoom automatique par défaut : " +msgstr "Zoom automatique : " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:220 msgid "Autoload tiles by default: " -msgstr "Chargement automatique des tuiles par défaut : " +msgstr "Chargement automatique : " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:224 @@ -14719,5 +14712,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:236 msgid "Tile cache directory: " -msgstr "Répertoire du cache des tuiles : " +msgstr "Répertoire du cache : " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:258 @@ -14735,13 +14728,13 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:269 msgid "Imagery Preferences" -msgstr "Préférence de l'imagerie" +msgstr "Paramètres d’imagerie" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:269 msgid "Modify list of imagery layers displayed in the Imagery menu" -msgstr "Modifier la liste des calques d'imagerie à partir du menu Imagerie." +msgstr "Modifier la liste des calques d’imagerie à partir du menu Imagerie." #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276 msgid "Imagery providers" -msgstr "Fournisseurs d'imagerie" +msgstr "Fournisseurs" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:278 @@ -14751,9 +14744,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:417 msgid "Available default entries:" -msgstr "Entrées par défaut disponibles :" +msgstr "Fournisseurs disponibles :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:443 msgid "Selected entries:" -msgstr "Entrées sélectionnées :" +msgstr "Fournisseurs actifs :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:461 @@ -14766,5 +14759,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:462 msgid "add a new wms/tms entry by entering the url" -msgstr "ajouter une nouvelle entrée wms/tms en entrant une url" +msgstr "Ajouter un nouveau fournisseur" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:470 @@ -14774,9 +14767,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:482 msgid "remove entry" -msgstr "supprimer l'entrée" +msgstr "Supprimer le fournisseur" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:508 msgid "copy selected defaults" -msgstr "copier les paramètres par défaut sélectionnés" +msgstr "Ajouter le fournisseur" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:527 @@ -14786,5 +14779,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564 msgid "reload defaults" -msgstr "recharger les paramètres par défaut" +msgstr "Actualiser la liste" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:579 @@ -14799,9 +14792,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:658 msgid "Menu Name (Default)" -msgstr "Nom de la carte (par défaut)" +msgstr "Nom de la carte" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:658 msgid "Imagery URL (Default)" -msgstr "URL d’imagerie (par défaut)" +msgstr "URL d’imagerie" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:701 @@ -14858,5 +14851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImagerySettingsMigration.java:163 msgid "Overwrite with WMSPlugin settings" -msgstr "Remplacer avec les paramètres WMS" +msgstr "Remplacer par les paramètres WMS" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImagerySettingsMigration.java:166 @@ -14895,9 +14888,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84 msgid "Show object ID in selection lists" -msgstr "Afficher l’identifiant de l’objet dans les listes de sélection" +msgstr "Afficher l’identifiant de l’objet dans la liste de sélection" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40 msgid "Show localized name in selection lists" -msgstr "Afficher le nom traduit dans les listes de sélection" +msgstr "Afficher le nom traduit dans la liste de sélection" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41 @@ -14913,5 +14906,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89 msgid "Show localized name in selection lists, if available" -msgstr "Afficher le nom traduit dans les listes de sélection, si disponible" +msgstr "Afficher le nom traduit dans la liste de sélection, si disponible" #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97 @@ -14922,9 +14915,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109 msgid "Look and Feel" -msgstr "Thème" +msgstr "Thème :" #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:45 msgid "Language" -msgstr "Langue" +msgstr "Langue :" #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:103 @@ -14938,5 +14931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:111 msgid "Available styles:" -msgstr "Styles disponibles :" +msgstr "Modèles disponibles :" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:113 @@ -14946,5 +14939,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:115 msgid "Add a new style by entering filename or URL" -msgstr "Ajouter un nouveau style en entrant un nom de fichier ou une URL" +msgstr "Ajouter un nouveau modèle" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:117 @@ -14958,9 +14951,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:121 msgid "Edit the filename or URL for the selected active style" -msgstr "Modifier l’URL ou le nom du modèle" +msgstr "Modifier le modèle" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:123 msgid "Add the selected available styles to the list of active styles" -msgstr "Ajouter le modèle à la liste" +msgstr "Ajouter le modèle" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:125 @@ -14987,10 +14980,10 @@ msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" msgstr "" -"Attention : le format d’entré dans la liste du modèle ''{0}'' est erroné. " -"Actuellement il est ''{1}''" +"Attention : le format d’entré dans la liste ''{0}'' est erroné. Actuellement " +"il est ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244 msgid "JOSM Internal Style" -msgstr "" +msgstr "JOSM" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245 @@ -15231,5 +15224,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322 msgid "Primary modifier:" -msgstr "Premier modifieur" +msgstr "Premier modifieur :" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:259 @@ -15238,5 +15231,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:328 msgid "Secondary modifier:" -msgstr "Second modifieur" +msgstr "Second modifieur :" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:265 @@ -15245,5 +15238,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:334 msgid "Tertiary modifier:" -msgstr "Troisième modifieur" +msgstr "Troisième modifieur :" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:273 @@ -15265,5 +15258,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:93 msgid "Close the preferences dialog and discard preference updates" -msgstr "Annuler les modifications et fermer la fenêtre des préférences" +msgstr "Annuler les modifications et fermer la fenêtre" #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:111 @@ -15322,21 +15315,21 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:139 msgid "Projection method" -msgstr "Méthode de projection" +msgstr "Méthode de projection :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142 msgid "Projection code" -msgstr "Code de la projection" +msgstr "Code de la projection :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:152 msgid "Display coordinates as" -msgstr "Afficher les coordonnées en" +msgstr "Afficher les coordonnées en :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:155 msgid "System of measurement" -msgstr "Système de mesure" +msgstr "Système de mesure :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 msgid "Map Projection" -msgstr "Projection de la carte" +msgstr "Projection" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:220 @@ -15375,5 +15368,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54 msgid "Confirm all Remote Control actions manually" -msgstr "Confirmer toutes les actions du contrôle à distance manuellement" +msgstr "Confirmer manuellement toutes les actions du contrôle à distance" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58 @@ -15420,6 +15413,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:66 msgid "Configure your identity and how to authenticate at the OSM server" -msgstr "" -"Enregistrer son identité et la manière de s’authentifier au serveur OSM" +msgstr "Enregistrer son identité et la méthode d’authentification" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67 @@ -15456,10 +15448,10 @@ #, java-format msgid "Short Description: {0}" -msgstr "Description brève : {0}" +msgstr "Description : {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634 #, java-format msgid "URL: {0}" -msgstr "URL: {0}" +msgstr "URL : {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:636 @@ -15509,5 +15501,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:897 msgid "Reset to default" -msgstr "Recharger les valeurs par défaut" +msgstr "Rétablir les valeurs par défaut" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1021 @@ -15589,5 +15581,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:147 msgid "Tagging Presets" -msgstr "Balises" +msgstr "Balisage" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:211 @@ -15601,35 +15593,31 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:215 msgid "Add a new preset by entering filename or URL" -msgstr "Ajouter un nouveau pré-réglage en entrant un nom de fichier ou une URL" +msgstr "Ajouter un nouveau modèle" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:217 msgid "New preset entry:" -msgstr "Nouvelle entrée de pré-réglage :" +msgstr "Nouveau modèle :" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:219 msgid "Remove the selected presets from the list of active presets" -msgstr "" -"Supprimer les pré-réglages sélectionnés de la liste des pré-réglages actifs" +msgstr "Supprimer le modèle" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:221 msgid "Edit the filename or URL for the selected active preset" -msgstr "" -"Òditer le nom de fichier ou l'URL pour le pré-réglage actif sélectionné" +msgstr "Modifier le modèle" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:223 msgid "Add the selected available presets to the list of active presets" -msgstr "" -"Ajouter les pré-réglages disponibles sélectionnés à la liste des pré-" -"réglages actifs" +msgstr "Ajouter le modèle" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:225 #, java-format msgid "Reloads the list of available presets from ''{0}''" -msgstr "Recharge la liste des pré-réglages disponibles pour ''{0}''" +msgstr "Actualiser la liste des modèles disponibles depuis ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:227 #, java-format msgid "Loading preset sources from ''{0}''" -msgstr "Chargement des sources de pré-réglages depuis \"{0}\"" +msgstr "Chargement des sources depuis \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:229 @@ -15639,6 +15627,6 @@ "

Details (untranslated):
{1}" msgstr "" -"Échec du chargement de la liste des sources de pré-réglages " -"depuis
''{0}''.

Détails (non traduits) :
{1}" +"Échec du chargement de la liste des sources depuis
''{0}''." +"

Détails (non traduits) :
{1}" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:236 @@ -15646,12 +15634,14 @@ msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''" msgstr "" +"Attention : le format d’entré dans la liste ''{0}'' est erroné. Actuellement " +"il est ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:331 msgid "Internal Preset" -msgstr "Pré-réglage interne" +msgstr "Modèle interne" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:332 msgid "The default preset for JOSM" -msgstr "Le pré-réglage par défaut pour JOSM" +msgstr "Le modèle par défaut pour JOSM" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270 @@ -15666,9 +15656,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584 msgid "Toolbar" -msgstr "Barre d’outils" +msgstr "Barre d’outils :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588 msgid "Available" -msgstr "Disponible" +msgstr "Outils disponibles :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627 @@ -15694,5 +15684,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:77 msgid "Use ignore list." -msgstr "Utiliser la liste des éléments ignorés." +msgstr "Utiliser la liste des éléments ignorés" #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:78 @@ -15703,5 +15693,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:81 msgid "Use error layer." -msgstr "Utiliser le calque d’erreur." +msgstr "Utiliser le calque d’erreur" #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:82 @@ -15711,18 +15701,19 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:85 msgid "Show informational level." -msgstr "Afficher le niveau d’information." +msgstr "Afficher le niveau d’information" #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:86 msgid "Show the informational tests." -msgstr "Montrer les tests informationnels." +msgstr "Afficher les tests d’information." #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:89 msgid "Show informational level on upload." -msgstr "Afficher le niveau d’information à l’envoi." +msgstr "Afficher le niveau d’information à l’envoi" #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:90 msgid "Show the informational tests in the upload check windows." msgstr "" -"Afficher les informations dans la fenêtre de vérification avant d’envoyer." +"Afficher les tests d’information dans la fenêtre de vérification avant " +"d’envoyer." #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:103 @@ -15732,5 +15723,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:104 msgid "On upload" -msgstr "À l’envoi" +msgstr "À l’envoi :" #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:114 @@ -15739,6 +15730,6 @@ "programs." msgstr "" -"Un validateur des données OSM qui vérifie les erreurs communes commises par " -"les utilisateurs et les programmes d’édition." +"Le validateur des données vérifie les erreurs communes commises par les " +"utilisateurs et les programmes d’édition." #: ../core/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java:115 @@ -15782,5 +15773,5 @@ "Please decide whether JOSM shall automatically update active plugins at " "startup after an update of JOSM itself." -msgstr "Les greffons activés sont automatiquement mis à jour au démarrage." +msgstr "Les greffons sont automatiquement mis à jour au démarrage" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96 @@ -15792,6 +15783,5 @@ "Please decide whether JOSM shall automatically update active plugins after a " "certain periode of time." -msgstr "" -"Les greffons activés sont automatiquement mis à jour après un laps de temps." +msgstr "Les greffons sont automatiquement mis à jour après un laps de temps" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51 @@ -15870,6 +15860,6 @@ "Select to use HTTP basic authentication with your OSM username and password" msgstr "" -"Cocher pour utiliser une authentification HTTP simple avec vos nom " -"d’utilisateur et mot de passe OSM" +"Utiliser une authentification HTTP simple avec vos nom d’utilisateur et mot " +"de passe OSM" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67 @@ -15879,5 +15869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68 msgid "Select to use OAuth as authentication mechanism" -msgstr "Cocher pour utiliser OAuth comme méthode d’identification" +msgstr "Utiliser une authentification OAuth" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106 @@ -15940,6 +15930,6 @@ "Please authorize first." msgstr "" -"Vous ne possédez pas encore d’autorisation d’accès au serveur OSM en " -"utilisant OAuth. Veuillez d’abord autoriser." +"Vous ne possédez pas encore d’autorisation d’accès OAuth pour le serveur " +"OSM. Veuillez d’abord autoriser." #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226 @@ -15954,5 +15944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307 msgid "Click to step through the OAuth authorization process" -msgstr "Effectuer les étapes du processus d’autorisation OAuth" +msgstr "Lancer le processus d’autorisation OAuth" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331 @@ -15965,6 +15955,6 @@ "Access Token" msgstr "" -"Effectuer les étapes du processus d’autorisation OAuth et générer une " -"nouvelle autorisation d’accès" +"Lancer le processus d’autorisation OAuth et générer une nouvelle " +"autorisation d’accès" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:357 @@ -15983,4 +15973,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Valider" @@ -15988,5 +15979,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:165 msgid "Test the API URL" -msgstr "Tester l’URL de l’API" +msgstr "Tester l’URL" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:181 @@ -16080,5 +16071,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:184 msgid "Delete the selection in the tag table" -msgstr "Supprimer la sélection des attributs" +msgstr "Supprimer l’attribut" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:276 @@ -16093,4 +16084,6 @@ "must be the same as in ''values''" msgstr "" +"Modèle de balisage \"{0}-{1}\" invalide - le nombre d'éléments dans " +"''display_values'' doit être le même que dans ''values''" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 @@ -16101,5 +16094,5 @@ "''short_descriptions'' must be the same as in ''values''" msgstr "" -"Pré-réglage de tagging \"{0}-{1}\" cassé - le nombre d'éléments dans " +"Modèle de balisage \"{0}-{1}\" invalide - le nombre d'éléments dans " "''short_descriptions'' doit être le même que dans ''values''" @@ -16209,10 +16202,10 @@ #, java-format msgid "Preset group {1} / {0}" -msgstr "Groupe d’attributs {1} / {0}" +msgstr "Balises {1} / {0}" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26 #, java-format msgid "Preset group {0}" -msgstr "Groupe d’attributs {0}" +msgstr "Balises {0}" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16 @@ -16258,5 +16251,5 @@ msgstr "" "URL provenant d’openstreetmap.org (vous pouvez coller ici l’URL d’une zone " -"délimitée)" +"délimitée) :" #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46 @@ -16615,6 +16608,6 @@ msgid "No primitive with id {0} in local dataset. Cannot infer primitive type." msgstr "" -"Aucune primitive avec l’identifiant {0} n’a été trouvée dans le jeu de " -"données. Impossible de déduire le type de la primitive." +"Aucun objet avec l’identifiant {0} n’a été trouvé dans le jeu de données. " +"Impossible de déduire le type de l’objet." #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 @@ -16663,10 +16656,11 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Le serveur a renvoyé une erreur 404, nouvelle tentative en utilisant des " -"requêtes individuelles pour chaque primitive." +"requêtes individuelles pour chaque objet." #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449 @@ -16719,9 +16713,9 @@ msgstr "La préférence ''{0}'' est manquante. Impossible d’initialiser OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Cette version de JOSM est incompatible avec le serveur défini." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16732,5 +16726,5 @@ "versions {0} à {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." @@ -16738,11 +16732,11 @@ "Communication établie avec {0} en utilisant le protocole de version {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +msgstr "Le calque {0} a été retiré car il n’est pas autorisé par l'’API." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -16751,24 +16745,24 @@ "il est \"{0}\"." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''." msgstr "" -"Le format pour la nouvelle version de la primitive modifiée \"{0}\" est " -"inattendue. Actuellement il est \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +"Le format pour la nouvelle version de l’objet modifié \"{0}\" est inattendu. " +"Actuellement il est \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Création d’un groupe de modifications…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Groupe de modifications {0} ouvert avec succès" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -16777,48 +16771,48 @@ "il est {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Mise à jour du groupe de modifications..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Mise à jour du groupe de modifications {0}…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Fermeture du groupe de modifications…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Aucun groupe de modifications pour l’envoi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Préparation de la requête d’envoi des données..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "En attente pendant 10 secondes… " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Nouvelle tentative {0} de {1} dans {2} secondes ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - réessayez." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Nouvelle tentative {0} de {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Le groupe de modifications est vide. Impossible d’envoyer les données." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -16827,5 +16821,5 @@ "Actuellement il est {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17123,5 +17117,5 @@ #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." -msgstr "Attribut obligatoire \"{0}\" manquant pour le chemin {1}." +msgstr "Attribut obligatoire \"{0}\" manquant sur du chemin {1}." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201 @@ -17192,5 +17186,5 @@ #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:221 msgid "Missing key or value attribute in tag." -msgstr "Clé manquante ou attribut de valeur dans étiquette manquant." +msgstr "Clé ou valeur manquante dans l'attribut." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272 @@ -17218,6 +17212,6 @@ "{1}." msgstr "" -"La valeur pour l’attribut ''version'' sur la primitive OSM avec " -"l’identifiant {0} est erronée. Actuellement elle est {1}." +"La valeur pour l’attribut ''version'' sur l’objet OSM avec l’identifiant {0} " +"est erronée. Actuellement elle est {1}." #. default version in 0.5 files for existing primitives @@ -17252,6 +17246,5 @@ #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." -msgstr "" -"Attribut ''version'' manquant pour la primitive OSM avec l’identifiant {0}." +msgstr "Attribut ''version'' manquant pour l’objet OSM avec l’identifiant {0}." #. for a new primitive we just log a warning @@ -17331,6 +17324,6 @@ "external id ''{1}''." msgstr "" -"La relation avec l’identifiant ''{0}'' se rapporte à une primitive manquante " -"avec l’identifiant ''{1}''." +"La relation avec l’identifiant ''{0}'' se rapporte à un objet manquant avec " +"l’identifiant ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535 @@ -17461,9 +17454,9 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126 msgid "Reading user info ..." -msgstr "Lecture des informations de l’utilisateur..." +msgstr "Lecture des informations sur l’utilisateur..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 msgid "Starting to upload with one request per primitive ..." -msgstr "Début de l’envoi des données avec une requête par primitive..." +msgstr "Début de l’envoi des données avec une requête par objet..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88 @@ -17499,5 +17492,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144 msgid "Starting to upload in chunks..." -msgstr "Début de l’envoi en morceaux..." +msgstr "Début de l’envoi en blocs..." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:160 @@ -17514,5 +17507,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218 msgid "Unexpected id 0 for osm primitive found" -msgstr "Un identifiant 0 inattendu a été trouvé sur une primitive OSM" +msgstr "Un identifiant 0 inattendu a été trouvé sur un objet OSM" #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11 @@ -17524,15 +17517,15 @@ #, java-format msgid "Querying offset availability: {0}" -msgstr "" +msgstr "Recherche de la disponibiité du décalage : {0}" #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:32 #, java-format msgid "Offset server response: {0}" -msgstr "" +msgstr "Réponse du serveur pour le décalage : {0}" #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:45 #, java-format msgid "Querying offset: {0}" -msgstr "" +msgstr "Recherche du décalage : {0}" #: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:103 @@ -17577,5 +17570,5 @@ #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52 msgid "Assume" -msgstr "" +msgstr "Supposer" #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java:36 @@ -17886,7 +17879,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745 msgid "Warning: failed to download plugin information list" -msgstr "" -"Attention : le téléchargement de la liste d’information concernant les " -"greffons a échoué" +msgstr "Attention : le téléchargement de la liste des greffons a échoué" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807 @@ -18014,5 +18005,5 @@ msgid "Failed to create plugin information from manifest for plugin ''{0}''" msgstr "" -"La création de l’information à partir du manifeste pour le greffon ''{0}'' a " +"La création d’information à partir du manifeste pour le greffon ''{0}'' a " "échoué" @@ -18020,5 +18011,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46 msgid "Reading local plugin information.." -msgstr "Lecture de l’information locale du greffon..." +msgstr "Lecture des informations locale du greffon..." #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:90 @@ -18378,7 +18369,7 @@ "community." msgstr "" -"La zone que vous essayer de télécharger est trop grande ou votre requête " -"était trop large.
Veuillez télécharger une zone plus petite ou utiliser " -"un fichier d’export fourni par la communauté OSM." +"La zone que vous essayer de télécharger est trop grande ou votre requête est " +"trop grosse.
Veuillez télécharger une zone plus petite ou utiliser un " +"fichier d’export fourni par la communauté OSM." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374 @@ -18494,5 +18485,6 @@ "\n" msgstr "" -"L’attribution du raccourci claver ''{0}'' à l’action ''{1}'' ({2}) a échoué\n" +"L’attribution du raccourci clavier ''{0}'' à l’action ''{1}'' ({2}) a " +"échoué\n" "car ce raccourci est déjà utilisé par l’action ''{3}'' ({4}).\n" "\n" @@ -18612,5 +18604,5 @@ msgstr "Erreur à la ligne " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "Fichier audio manquant" @@ -18662,5 +18654,5 @@ #, java-format msgid "Missing mandatory attribute ''{0}'' on of relation {1}." -msgstr "" +msgstr "Attribut obligatoire \"{0}\" manquant sur de la relation {1}." #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:326 @@ -18668,4 +18660,5 @@ msgid "Illegal value for attribute ''uid''. Got ''{0}''." msgstr "" +"La valeur pour l’attribut ''uid'' est erronée. Actuellement elle est ''{0}''." #: ../plugins/CommandLine/src/CommandLine/Parameter.java:52 @@ -19033,5 +19026,5 @@ #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:222 msgid "Selected Street" -msgstr "Rue sélectionnée" +msgstr "" #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:235 @@ -19092,5 +19085,5 @@ #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:170 msgid "Street" -msgstr "Rue" +msgstr "Rue :" #. item "Waypoints/Motorway Junction" text "Number" @@ -19241,5 +19234,5 @@ #, java-format msgid "Info: {0}" -msgstr "Info: {0}" +msgstr "Informations : {0}" #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135 @@ -19362,5 +19355,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:499 msgid "Optional Information:" -msgstr "Information optionnelle :" +msgstr "Informations optionnelles :" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:684 @@ -19478,5 +19471,5 @@ #, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "Le paramètre ''{0}'' ne doit pas être nul." +msgstr "Le paramètre ''{0}'' ne doit pas être vide" #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71 @@ -19720,5 +19713,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23 msgid "Buildings tags:" -msgstr "Attributs de bâtiments :" +msgstr "Attributs des bâtiments :" #: ../plugins/buildings_tools/src/buildings_tools/Building.java:233 @@ -19791,5 +19784,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:447 msgid "Next no" -msgstr "Num. suivant" +msgstr "Numéro suivant :" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:489 @@ -19804,6 +19797,6 @@ "(No = new cache)" msgstr "" -"La commune \"{0}\" est présente dans le cache.\n" -"Charger le cache ?\n" +"La commune \"{0}\" est déjà présente dans le cache.\n" +"Voulez-vous charger le cache ?\n" "(Non = nouveau cache)" @@ -19814,5 +19807,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:441 msgid "Select Feuille" -msgstr "Sélectionner la feuille cadastrale." +msgstr "Sélectionner un calque cadastral" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:150 @@ -19900,5 +19893,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:190 msgid "Auto sourcing" -msgstr "Enregistrement automatique de la source" +msgstr "Enregistrer la source automatiquement" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:256 @@ -19932,22 +19925,22 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31 msgid "Replace original background by JOSM background color." -msgstr "Remplacer la couleur d'arrière-plan par celle de JOSM." +msgstr "Remplacer la couleur d’arrière-plan par celle de JOSM" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33 msgid "Reverse grey colors (for black backgrounds)." -msgstr "Inverser les couleurs grises (pour les fonds noir)." +msgstr "Inverser les couleurs grises (pour les fonds noirs)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35 msgid "Set background transparent." -msgstr "Appliquer une transparence." +msgstr "Appliquer une transparence :" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37 msgid "Draw boundaries of downloaded data." -msgstr "Tracer les limites des données téléchargées." +msgstr "Tracer les limites des données téléchargées" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 #: ../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." +msgstr "Désactiver le recadrage pendant le géoréférencement" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 @@ -19957,5 +19950,5 @@ #: ../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." +msgstr "Sélectionner le premier calque WMS dans la liste" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47 @@ -19963,5 +19956,5 @@ msgstr "" "Ne pas utiliser de relation pour les adresses mais \"addr:street\" sur les " -"éléments." +"éléments" #. item "Man Made/Man Made/Pipeline" combo "Type" display value @@ -20074,10 +20067,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84 msgid "Enable automatic caching." -msgstr "Activer le tampon automatique." +msgstr "Activer le tampon automatique" #. disabled by default #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87 msgid "Max. cache size (in MB)" -msgstr "Taille maximale du tampon (en MB)" +msgstr "Taille maximale du tampon (en MB) :" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 @@ -20136,5 +20129,5 @@ msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" -"Afficher un rectangle autour des données téléchargées depuis le serveur WMS." +"Tracer un rectangle autour des données téléchargées depuis le serveur WMS." #. option to select the single grabbed image resolution @@ -20175,5 +20168,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199 msgid "Vector images grab multiplier:" -msgstr "Multiplicateur d’images" +msgstr "Multiplicateur d’images :" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 @@ -20203,13 +20196,13 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251 msgid "See, rivers, swimming pools." -msgstr "Mers, fleuves, rivières, piscines." +msgstr "Mers, fleuves, rivières, piscines" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254 msgid "Buildings, covers, underground constructions." -msgstr "Bâtiments, constructions." +msgstr "Bâtiments, constructions" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257 msgid "Symbols like cristian cross." -msgstr "Symboles." +msgstr "Symboles" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260 @@ -20219,17 +20212,17 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263 msgid "Parcels numbers, street names." -msgstr "Numéros des parcelles, noms des rues." +msgstr "Numéros des parcelles, noms des rues" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266 msgid "Address, houses numbers." -msgstr "Adresses, numéros d’adresses." +msgstr "Adresses, numéros d’adresses" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269 msgid "Locality, hamlet, place." -msgstr "Lieu-dit, hameau, site." +msgstr "Lieu-dit, hameau, site" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272 msgid "Cadastral sections and subsections." -msgstr "Sections et sous-sections cadastrales." +msgstr "Sections et sous-sections cadastrales" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275 @@ -20239,5 +20232,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283 msgid "Raster images grab multiplier:" -msgstr "Multiplicateur d’images matricielles" +msgstr "Multiplicateur d’images matricielles :" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294 @@ -20268,5 +20261,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348 msgid "Enable this to use the tag \"add:street\" on nodes." -msgstr "Activer ceci afin d'utiliser le tag \"add:street\" sur les nœuds." +msgstr "Utiliser l’attribut \"add:street\" sur les nœuds." #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -20499,9 +20492,9 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:67 msgid "Add a new municipality layer" -msgstr "Ajouter un nouveau calque de commune" +msgstr "Ajouter un nouveau calque cadastral" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:69 msgid "Commune" -msgstr "Commune" +msgstr "Commune :" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:71 @@ -20515,5 +20508,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:73 msgid "Departement" -msgstr "Département" +msgstr "Département :" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:78 @@ -20691,5 +20684,5 @@ "faire glisser une portion de chemin" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "Fusion du contour" @@ -20702,5 +20695,5 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:42 msgid "Splits an area by an untagged way." -msgstr "Divise une zone à l’aide d’un chemin sans attribut." +msgstr "Divise une zone à l'aide d’un chemin sans attribut." #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78 @@ -20949,4 +20942,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21189,5 +21183,5 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:68 msgid "this layer is no osm data layer" -msgstr "" +msgstr "ce calque n’est pas un calque de données OSM" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:81 @@ -21260,5 +21254,5 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "Create" -msgstr "" +msgstr "Créer" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 @@ -21447,5 +21441,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52 msgid "Size of Landsat tiles (pixels)" -msgstr "Taille des tuiles Landsat (en pixels)" +msgstr "Taille des tuiles Landsat (en pixels) :" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54 @@ -21611,5 +21605,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52 msgid "Way Info" -msgstr "Information sur le chemin" +msgstr "Informations sur le chemin" #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58 @@ -21658,5 +21652,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "Ouvrir MapDust" @@ -21765,4 +21759,8 @@ msgstr "Un des chemins sélectionné fait déjà partie d’un autre multipolygone." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21970,22 +21968,22 @@ msgstr "Exécutable Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "Erreur de transformation: Min X doit être inférieur à max" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "Erreur de transformation: Min Y doit être inférieur à max" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" -msgstr "Erreur de transformation: les points sont trop proches" - -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +msgstr "Erreur de transformation : les points sont trop proches" + +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Erreur de transformation: variante non supportée" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Erreur de transformation: orientation non supportée" @@ -22104,9 +22102,9 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:478 msgid "Close the dialog and apply projection preferences" -msgstr "" +msgstr "Appliquer la projection et fermer la fenêtre" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:491 msgid "Close the dialog, discard projection preference changes" -msgstr "" +msgstr "Annuler les modifications et fermer la fenêtre" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:544 @@ -22278,5 +22276,5 @@ msgid "Write position information into the exif header of the following files:" msgstr "" -"Écrire l’information de la position dans l’entête exif des fichiers " +"Écrire les informations sur la position dans l’entête exif des fichiers " "suivants :" @@ -22308,5 +22306,5 @@ #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184 msgid "Writing position information to image files..." -msgstr "Écriture de l’information sur la position dans les fichiers images..." +msgstr "Écriture des informations sur la position dans les fichiers images..." #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:208 @@ -22630,4 +22628,14 @@ msgstr "Points" +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Editeur de relation : {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" + #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:19 @@ -22637,5 +22645,5 @@ #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25 msgid "Revert changeset fully" -msgstr "Annuler la liste des changements dans son ensemble" +msgstr "Annuler le groupe de modifications" #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26 @@ -22651,5 +22659,5 @@ #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28 msgid "Revert changeset" -msgstr "Réversion du groupe de changement" +msgstr "Réversion du groupe de modifications" #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46 @@ -22684,6 +22692,6 @@ "It is needed to download them before reverting. Do you want to continue?" msgstr "" -"Ce jeu de modifications contient des objets qui ne sont pas présents dans le " -"jeu de données en cours.\n" +"Ce groupe de modifications contient des objets qui ne sont pas présents dans " +"le jeu de données en cours.\n" "Il est nécessaire de les télécharger avant de retourner à l’état antérieur. " "Voulez-vous continuer ?" @@ -22695,14 +22703,14 @@ #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64 msgid "Fetching missing primitives" -msgstr "Récupération des primitives manquantes" +msgstr "Récupération des objets manquants" #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75 msgid "Downloading changeset" -msgstr "Téléchargement du set de changements" +msgstr "Téléchargement du groupe de modifications" #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98 #, java-format msgid "Revert changeset #{0}" -msgstr "Réversion du groupe de changement #{0}" +msgstr "Réversion du groupe de modifications n°{0}" #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:29 @@ -22743,5 +22751,5 @@ #, java-format msgid "Error parsing tagging preset from ''{0}'':\n" -msgstr "Erreur d'analyse de l'attribut de pré-réglage de \"{0}\":\n" +msgstr "Erreur d'analyse de l'attribut de la balise depuis \"{0}\":\n" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108 @@ -22953,8 +22961,7 @@ "to install a scripting engine with JOSM.

" msgstr "" -"

Le script ne peut pas être exécuté car pour l'instant il n'y a pas de " -"moteur de script installé.

Consultez l'aide en ligne pour plus " -"d'informations sur la manière d'installer une machine de script avec JOSM." +"

Le script ne peut être exécuté car il n’y a aucun moteur de script " +"installé.

Consultez l’aide en ligne pour plus d’informations sur " +"comment installer un moteur de script avec JOSM.

" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:277 @@ -23098,5 +23105,5 @@ #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:34 msgid "Language:" -msgstr "Langue:" +msgstr "Langue :" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:35 @@ -23221,9 +23228,9 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:290 msgid "Abort tag editing and close dialog" -msgstr "Annuler la modification des attributs et fermer la fenêtre" +msgstr "Annuler les modification et fermer la fenêtre" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:303 msgid "Apply edited tags and close dialog" -msgstr "Appliquer la modification des attributs et fermer la fenêtre" +msgstr "Appliquer les modification et fermer la fenêtre" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -23261,6 +23268,5 @@ msgid "" "Open the tagging preset test tool for previewing tagging preset dialogs." -msgstr "" -"Ouvrir l’outil de vérification des attributs afin de les prévisualiser." +msgstr "Ouvrir l’outil de vérification des balises pour les prévisualiser." #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43 @@ -23494,5 +23500,5 @@ #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39 msgid "OSM-Info" -msgstr "" +msgstr "Informations OSM" #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39 @@ -23533,4 +23539,5 @@ msgid "Show all available signatures for selected attribute." msgstr "" +"Afficher toutes les signatures disponibles pour l’attribut sélectionné." #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:46 @@ -23547,9 +23554,9 @@ #, java-format msgid "{0} Signatures found." -msgstr "" +msgstr "{0} signatures trouvées." #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:117 msgid "Signature Info" -msgstr "" +msgstr "Informations sur la signature" #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:126 @@ -23569,8 +23576,10 @@ "{0}" msgstr "" +"Le nœud sélectionné était :\n" +"{0}" #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:136 msgid "Sorry, there are no Signatures for the selected Attribute." -msgstr "" +msgstr "Désolé, il n’y a pas de signature pour l’attribut sélectionné." #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:138 @@ -23580,8 +23589,10 @@ "{0}={1}" msgstr "" +"La paire clé-valeur était :\n" +"{0}-{1}" #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:145 msgid "Sorry, there are no Signatures for the selected Segment." -msgstr "" +msgstr "Désolé, il n’y a pas de signature pour le segment sélectionné." #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:147 @@ -23791,4 +23802,60 @@ msgstr "Créer une nouvelle clé signée" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23873,9 +23940,9 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:166 msgid "Move the selected relation members down by one position" -msgstr "Déplacer les membres selectionnés d'une position vers le bas" +msgstr "Monter les membres selectionnés d'une position" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:193 msgid "Move the selected relation members up by one position" -msgstr "Déplacer les membres selectionnés d'une position vers le haut" +msgstr "Descendre les membres sélectionnés d'une position" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:135 @@ -24009,13 +24076,4 @@ "
Voulez-vous créer un conflit et fermer l’éditeur ?" -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." -msgstr "" -"Le calque ''{0}'' a déjà un conflit pour l’objet
''{1}''." -"
Veuillez d’abord résoudre ce conflit puis réessayer." - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -24549,5 +24607,5 @@ #, java-format msgid "The required tag {0}={1} is missing." -msgstr "L’attribut {0}={1} manque." +msgstr "L’attribut {0}={1} est manquant." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45 @@ -24691,5 +24749,5 @@ #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:49 msgid "Select Way Nodes" -msgstr "" +msgstr "Sélectionnez les nœuds du chemin" #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:48 @@ -24932,5 +24990,6 @@ msgid "Could not read information from walking-papers.org the id \"{0}\"" msgstr "" -"Impossible de lire l’information depuis walking-papers.org pour l’id \"{0}\"" +"Impossible de lire les informations depuis walking-papers.org pour " +"l’identifiant \"{0}\"" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59 @@ -25024,5 +25083,5 @@ #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:56 msgid "Select waypoint to move map" -msgstr "Sélectionner un point pour déplacer la carte" +msgstr "Sélectionnez un point pour déplacer la carte" #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/WaypointSearchPlugin.java:18 @@ -25075,5 +25134,5 @@ #: build/specialmessages.java:11 msgid "JOSM-Trac login at josm.openstreetmap.de" -msgstr "" +msgstr "JOSM-Connexion à josm.openstreetmap.de" #. Java message loading audio data @@ -25131,5 +25190,5 @@ msgctxt "Relation type" msgid "enforcement" -msgstr "" +msgstr "application" #. relation type @@ -25209,5 +25268,5 @@ msgctxt "Place type" msgid "borough" -msgstr "" +msgstr "arrondissement" #. relation place type @@ -25672,6 +25731,11 @@ msgstr "Convertir une aire en multipolygone" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25683,15 +25747,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "Options étendues pour modifier les horaires d'ouverture" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importe les erreurs d’OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25701,5 +25765,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25707,10 +25771,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "Importe le fichier PDF et le convertit en chemins." #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25721,5 +25785,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25730,15 +25794,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ajoute le thème JGoodies." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25747,20 +25811,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "Ajoute l'option "Redémarrer JOSM" dans le menu Fichier." #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" -msgstr "Greffon pour annuler des groupes de modifications" +msgstr "Greffon pour annuler les groupes de modifications" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "Utilise l'image rgis.spb.ru comme calque superposable." #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -25770,5 +25834,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -25780,15 +25844,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Fournit des capacités de calcul d’itinéraire." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25801,20 +25865,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "Crée et modifie les cartes maritimes pour OpenSeaMap" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25822,19 +25886,19 @@ "the jar-file as standalone as well." msgstr "" -"ajoute un vérificateur d’attribut qui vous aidera à créer des modèles de " -"balise. Vous pouvez démarrer le fichier .jar indépendamment." +"ajoute un vérificateur d’attribut qui vous aidera à créer des groupes de " +"balises. Vous pouvez démarrer le fichier .jar indépendamment." #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Créer des maisons mitoyennes depuis des blocs entiers." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "Crée et modifie les marqueurs maritimes pour OpenSeaMap" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25846,5 +25910,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25855,10 +25919,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25869,15 +25939,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "Plusieurs outils pour rendre votre vie plus facile." #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25890,5 +25960,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25899,20 +25969,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "Active la recherche de points importés à partir d'un fichier gpx" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 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:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -27698,5 +27768,5 @@ #: build/trans_presets.java:3059 msgid "no" -msgstr "aucun" +msgstr "non" #. item "Highways/Streets/Road Restrictions" combo "Agricultural" @@ -27860,15 +27930,15 @@ #: build/trans_presets.java:444 msgid "Max. Height (meters)" -msgstr "Hauteur maximale (mètres)" +msgstr "Hauteur maximale (mètres) :" #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)" #: build/trans_presets.java:445 msgid "Max. Width (meters)" -msgstr "Largeur maximale (mètres)" +msgstr "Largeur maximale (mètres) :" #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)" #: build/trans_presets.java:446 msgid "Max. Length (meters)" -msgstr "Longueur maximale (mètres)" +msgstr "Longueur maximale (mètres) :" #. @@ -28089,5 +28159,5 @@ #: build/trans_presets.java:477 msgid "swing" -msgstr "" +msgstr "tournant" #. item "Highways/Streets/Bridge" combo "Bridge" display value @@ -28186,20 +28256,20 @@ #: build/trans_presets.java:534 msgid "T3 - difficult, exposed hiking trail" -msgstr "T3 - difficile, sentier de randonnée exposé" +msgstr "T3 - sentier de randonnée difficile et exposé" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T4 - difficult, exposed, steep alpine trail" -msgstr "T4 - difficile, exposé, sentier alpin escarpé" +msgstr "T4 - sentier alpin difficile, escarpé et exposé" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T5 - difficult alpine trail with climbing" -msgstr "T5 - sentier alpin difficile à grimper" +msgstr "T5 - sentier alpin difficile avec escalade" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T6 - hazardous alpine trail with climbing" -msgstr "T6 - sentier alpin dangereux à escalader" +msgstr "T6 - sentier alpin dangereux avec escalade" #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description @@ -28207,6 +28277,5 @@ msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard" msgstr "" -"Sentier bien dégagé. Surface plane ou légèrement en pente, pas de risque de " -"chute" +"Sentier dégagé. Surface plane ou légèrement en pente, aucun risque de chute." #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description @@ -28217,5 +28286,5 @@ msgstr "" "Sentier avec pente constante et montée équilibrée. Terrain en partie raide, " -"risque de chute possible" +"risque de chute possible." #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description @@ -28226,7 +28295,7 @@ "jagged rocks" msgstr "" -"sites exposés pouvant être sécurisés avec des cordes ou chaînes, nécessité " -"éventuelle d'utiliser les mains pour l'équilibre. Sites partiellement " -"exposés avec risques de chute, pierriers, hors-pistes avec rochers escarpés" +"Passages exposés pouvant être sécurisés avec des cordes ou chaînes, " +"nécessité éventuelle d’utiliser les mains pour l’équilibre. Terrains " +"partiellement exposés avec risques de chute, pierriers et hors-pistes." #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description @@ -28236,7 +28305,6 @@ "grassy acclivities, jagged rocks, facile snow-free glaciers." msgstr "" -"parfois nécessaire d'utiliser les mains pour progresser. Terrain bien " -"exposé, pentes herbeuses précaires, des rochers escarpés, glaciers faciles " -"sans neige." +"Terrain assez exposé, pentes herbeuses délicates, rochers, glacier non " +"recouverts de neige. Nécessite parfois d’utiliser les mains pour progresser." #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description @@ -28246,4 +28314,6 @@ "jagged rocks, few dangerous glacier and snow" msgstr "" +"Terrain exposé, exigeant avec pierriers. Glaciers et névés présentant un " +"risque de glissade. Quelques passages d'escalade." #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description @@ -28253,4 +28323,6 @@ "glacier with danger to slip and fall" msgstr "" +"Terrain souvent très exposé avec pierriers délicats. Glaciers avec risque " +"accru de glissade et de chute. Passages d'escalade difficiles." #. item "Ways/Path" combo "Visibility" display value @@ -29493,5 +29565,5 @@ #: build/trans_presets.java:1179 msgid "Shipping" -msgstr "Expédition" +msgstr "Navigation" #. item "Shipping/Ferry Terminal" @@ -30814,5 +30886,5 @@ #: build/trans_presets.java:3611 build/trans_presets.java:3620 msgid "Mo-Fr 08:30-20:00" -msgstr "Lun-Ven 08:30-20:00" +msgstr "Mo-Fr 08:30-20:00" #. item "Car/Fuel" combo "Opening Hours" display value @@ -31273,5 +31345,5 @@ #: build/trans_presets.java:1553 msgid "independent" -msgstr "" +msgstr "indépendant" #. item "Motorcycle/Motorcycle Dealer" label "Services:" @@ -31283,5 +31355,5 @@ #: build/trans_presets.java:1557 msgid "Sale" -msgstr "" +msgstr "Vente" #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value @@ -31295,5 +31367,5 @@ msgctxt "motorcycle" msgid "brand" -msgstr "Marque" +msgstr "marque" #. item "Motorcycle/Motorcycle Dealer" combo "Sale" display value @@ -31327,5 +31399,5 @@ #: build/trans_presets.java:1560 msgid "Safety inspection" -msgstr "Inspection de sécurité" +msgstr "Contrôle technique" #. item "Motorcycle/Motorcycle Dealer" combo "Safety inspection" display value @@ -32599,5 +32671,5 @@ #: build/trans_presets.java:2152 msgid "Other Information Points" -msgstr "Point d’information" +msgstr "Point d’informations" #. group "Leisure" @@ -32633,5 +32705,5 @@ #: build/trans_presets.java:2176 msgid "Dog Park" -msgstr "" +msgstr "Parc canin" #. @@ -41346,4 +41418,347 @@ msgstr "Essai" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "nom de rue abrégé" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "attribut « sens unique (oneway) » sur un nœud" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "attribut « pont (bridge) » sur un nœud" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "valeur incorrecte de l’attribut « voie (highway) » sur un nœud" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Chemin non-classifié non nommé." + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "Voie sans référence" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "type de voie temporaire" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "nom de clé mal orthographié" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "voie cyclable avec l’attribut « vélo (bicyle) »" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "Chemin pour piétons avec l’attribut « piéton (foot) »" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "voie cyclable séparée avec l’attribut couloir cyclable" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "Barrière utilisée sur la voie" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "Limitation de vitesse utilisée pour un chemin pour piétons" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "Étiquette du calque avec un signe +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "le nom de la rue contient ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relation sans type" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurant sans nom" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "combinaison inhabituelle d’attributs" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (mirroir)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Geofabrik.de (Rhénanie-du-Nord-Westphalie) - Allemagne" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "CUZK:KM - République tchèque" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "UHUL:ORTOFOTO - République tchèque" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "Cartes NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "Cartes NPE (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "Ordnance Survey (7th series) - Royaume-Uni" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT (ORTHO) - Japon" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT (ORTHO01) - Japon" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT (ORTHO02) - Japon" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT (ORTHO03) - Japon" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italie" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicile - Italie" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - Italie" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "vers l’objet {0}" +#~ msgstr[1] "vers les objets {0}" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "{0} objet restauré" +#~ msgstr[1] "{0} objets restaurés" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Le calque ''{0}'' possède un conflit sur l’objet
''{1}''." +#~ "
Veuillez d’abord résoudre ce conflit puis réessayer." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Attention : l’objet \"{0}\" est déjà supprimée sur le serveur. Il sera " +#~ "ignoré pour compléter l’envoi." + #~ msgid "Move" #~ msgstr "Déplacer" @@ -41419,7 +41834,4 @@ #~ msgid "Instead of --download= you may specify osm://\n" #~ msgstr "Au lieu de --download= vous devriez indiquer osm://\n" - -#~ msgid "Object" -#~ msgstr "Objet" #~ msgid "{0} object has conflicts:" @@ -41802,10 +42214,4 @@ #~ msgid "Amenities" #~ msgstr "Équipements" - -#~ msgid "abbreviated street name" -#~ msgstr "nom de rue abrégé" - -#~ msgid "Landsat" -#~ msgstr "Landsat" #~ msgid "YAHOO (GNOME)" @@ -42478,7 +42884,4 @@ #~ msgstr "Veuillez sélectionner quelques données" -#~ msgid "restaurant without name" -#~ msgstr "restaurant sans nom" - #~ msgid "Show Author Panel" #~ msgstr "Afficher la liste des auteurs" @@ -42569,7 +42972,4 @@ #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" #~ msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "Cartes NPE (Tim)" #~ msgid "Please select one or more closed ways of at least four nodes." @@ -42975,7 +43375,4 @@ #~ msgstr "Déplacer vers le bas" -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editeur de relation : {0}" - #~ msgid "Solve Conflict" #~ msgstr "Résoudre le conflit" @@ -43213,19 +43610,4 @@ #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Haut Palatinat Geofabrik.de" - -#~ msgid "NPE Maps" -#~ msgstr "Cartes NPE" - -#~ msgid "barrier used on a way" -#~ msgstr "Barrière utilisée sur la voie" - -#~ msgid "street name contains ss" -#~ msgstr "le nom de la rue contient ss" - -#~ msgid "relation without type" -#~ msgstr "relation sans type" - -#~ msgid "temporary highway type" -#~ msgstr "type de voie temporaire" #~ msgid "Click to add route nodes." @@ -44223,13 +44605,4 @@ #~ msgstr "Copier les valeurs par défaut" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - #~ msgid "({0}/{1}) Loading parents of primitive {2}" #~ msgstr "({0}/{1}) Téléchargement des parents des primitives {2}" @@ -44313,10 +44686,4 @@ #~ msgid "Delete all" #~ msgstr "Tout supprimer" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Chemin non-classifié non nommé." - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" #~ msgid "" @@ -44736,10 +45103,4 @@ #~ "Échec (NullPointerException). Sans doute parce qu'il manque des attributs." -#~ msgid "bridge tag on a node" -#~ msgstr "attribut « pont (bridge) » sur un nœud" - -#~ msgid "oneway tag on a node" -#~ msgstr "attribut « sens unique (oneway) » sur un nœud" - #~ msgid "" #~ "Version {0} created on {1} by " @@ -44845,10 +45206,4 @@ #~ msgstr "Veuillez redémarrer JOSM." -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italie" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicile - Italie" - #~ msgid "Could not create a node with the entered latitude/longitude." #~ msgstr "" @@ -44878,10 +45233,4 @@ #~ msgid "You must select at least two ways." #~ msgstr "Vous devez sélectionner au moins deux chemins." - -#~ msgid "wrong highway tag on a node" -#~ msgstr "valeur incorrecte de l’attribut « voie (highway) » sur un nœud" - -#~ msgid "layer tag with + sign" -#~ msgstr "Étiquette du calque avec un signe +" #~ msgid "Please enter a latitude in the range -90..90" @@ -45033,4 +45382,11 @@ #~ msgstr "Conserver l’état de visbilité du serveur" +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "La relation enfant
{0}
est supprimée sur le serveur et ne " +#~ "peut être chargée." + #~ msgid "GPS point" #~ msgstr "Point GPS" @@ -45065,7 +45421,4 @@ #~ msgid "Displays an OpenLayers background image" #~ msgstr "Affiche une image d’arrière plan provenant d’OpenLayers" - -#~ msgid "unusual tag combination" -#~ msgstr "combinaison inhabituelle d’attributs" #~ msgid "Wrong number of parameters for tags operator." @@ -45158,6 +45511,7 @@ #~ msgstr "Chemins dupliqués avec un décalage" -#~ msgid "cycleway with tag bicycle" -#~ msgstr "voie cyclable avec l’attribut « vélo (bicyle) »" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "" +#~ "Seulement pour les directions intéressantes (sens unique par exemple)" #~ msgid "Football" @@ -45328,7 +45682,4 @@ #~ "display_values doit être le même que dans les valeurs" -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "voie cyclable séparée avec l’attribut couloir cyclable" - #~ msgid "More than one \"via\" found." #~ msgstr "Plus d’un chemin \"via\" trouvé." @@ -45342,7 +45693,4 @@ #~ msgid "The \"from\" way does not start or end at a \"via\" node." #~ msgstr "Le chemin \"from\" ne commence ou ne fini pas par un nœud \"via\"." - -#~ msgid "highway without a reference" -#~ msgstr "Voie sans référence" #~ msgid "Enter the coordinates for the new node." @@ -45381,4 +45729,21 @@ #~ "{0} nœuds utilisés sur le chemin {1}
ont été supprimé sur le serveur." #~ "
Voulez-vous récupérer ces nœuds ?" + +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

Contenu d’aide pour sujet manquant

Un contenu d’aide pour le sujet {0} n’est pas encore disponible ni dans votre langue ({1}) ni en " +#~ "anglais.
Merci d’améliorer le système d’aide de JOSM en remplissant " +#~ "les informations manquantes. Vous pouvez modifier l’aide " +#~ "dans votre langue ({1}) et l’aide en anglais." #~ msgid "" @@ -45434,7 +45799,4 @@ #~ msgstr "Aucun nom d’utilisateur fourni." -#~ msgid "misspelled key name" -#~ msgstr "nom de clé mal orthographié" - #~ msgid "Reset id to 0" #~ msgstr "Réinitialisation de l’identifiant à 0" @@ -45456,4 +45818,12 @@ #~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Ni {0} ni {1} n’est coché." +#~ "
Veuillez choisir le téléchargement des données OSM, des données GPX, " +#~ "ou des deux." + +#~ msgid "" #~ "Display georeferenced images as background in JOSM (WMS servers, " #~ "Yahoo, ...)." @@ -45551,4 +45921,7 @@ #~ "gérer cette incohérence. L’objet cible est gardé. " +#~ msgid "Click do download the currently selected area" +#~ msgstr "Télécharger la zone sélectionnée" + #~ msgid "" #~ "Move objects by dragging; Shift to add to selection (Ctrl to toggle); " @@ -45577,31 +45950,4 @@ #~ msgstr "Copier le(s) réglage(s) par défaut sélectionné(s)" -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT (ORTHO) - Japon" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT (ORTHO01) - Japon" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT (ORTHO02) - Japon" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT (ORTHO03) - Japon" - -#~ msgid "7th Series (OS7)" -#~ msgstr "Ordnance Survey (7th series) - Royaume-Uni" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "CUZK:KM - République tchèque" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "UHUL:ORTOFOTO - République tchèque" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Geofabrik.de (Rhénanie-du-Nord-Westphalie) - Allemagne" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - #~ msgid "Enter a menu name and WMS URL" #~ msgstr "Entrer un nom pour la carte et une URL pour le service WMS" @@ -45682,10 +46028,4 @@ #~ msgstr "La cible de type {0} avec un id {1} est une version invalide" -#~ msgid "footway with tag foot" -#~ msgstr "Chemin pour piétons avec l’attribut « piéton (foot) »" - -#~ msgid "maxspeed used for footway" -#~ msgstr "Limitation de vitesse utilisée pour un chemin pour piétons" - #~ msgid "" #~ "Aligning would result nodes outside the world.\n" @@ -45730,10 +46070,4 @@ #~ "JOSM a trouvé {0} calques de données OSM non sauvegardées. Il semblerait " #~ "que JOSM a planté la dernière fois. Souhaitez-vous restaurer les données ?" - -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (mirroir)" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - Italie" #~ msgid "" @@ -45875,4 +46209,7 @@ #~ msgstr "Activer les valeurs par défaut" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Ouvrir la page d’aide du wiki dans le navigateur" + #~ msgid "Projection ''{0}'' not found" #~ msgstr "Projection ''{0}'' non trouvée" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 25650) +++ /applications/editors/josm/i18n/po/gl.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2010-12-30 18:03+0000\n" "Last-Translator: Miguel Anxo Bouzada \n" @@ -16,16 +16,16 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:30+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:34+0000\n" +"X-Generator: Launchpad (build 12617)\n" "Language: gl\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -35,12 +35,12 @@ msgstr "Axuda" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de ficheiro mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -76,7 +76,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -109,14 +109,14 @@ msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "O parametro \"downloadgps\" non acepta nomes de ficheiros ou URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -126,13 +126,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/Main.java:759 +msgid "Exit JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:760 +msgid "Continue, try anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:761 -msgid "Exit JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:762 -msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -153,4 +153,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -192,18 +193,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -222,4 +223,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Acerca de" @@ -306,8 +309,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "AVISO:formato inesperado da API base URL. Redirección á información ou a " @@ -412,4 +415,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -493,5 +497,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -580,6 +584,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -622,51 +626,51 @@ msgstr "Escolla polo menos tres nodos." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "datos" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "capa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "selección" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflito" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "descargar" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "anterior" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "seguinte" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Non se seleccionou nada sobre o que facer zoom." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Facer zoom a {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Facer zoom na vista a {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -676,5 +680,5 @@ msgstr "Vista: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Non hai conflitos sobre os que facer zoom" @@ -980,9 +984,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Descargar as primitivas referenciando a unha das primitivas escollidas" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -991,5 +996,5 @@ msgstr "Duplicar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicar selección copiando e pegando inmediatamente." @@ -1097,5 +1102,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1456,5 +1461,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Misturar os primiotivos acuais dentro de outra capa" @@ -1740,8 +1746,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Os datos copiados conteñen primitivas incompletas. Ao pegar borraranse as " @@ -1768,9 +1775,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "a {0} primitiva" -msgstr[1] "a {0} primitivas" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Borrado {0} obxecto" +msgstr[1] "Borrados {0} obxectos" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1885,4 +1892,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2829,5 +2837,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2835,4 +2843,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3465,7 +3474,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3479,8 +3488,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Atención: A capa \"{0}\" xa non existe. Non se pode eliminar o conflicto " @@ -3695,9 +3704,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Restaurar {0} primitiva" -msgstr[1] "Restaurar {0} primitivas" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Borrado {0} obxecto" +msgstr[1] "Borrados {0} obxectos" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4019,5 +4028,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4080,8 +4089,9 @@ msgstr "Non se atopa o obxectivo a misturar do tipo {0} con id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4244,5 +4254,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "fondo" @@ -4945,5 +4955,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4957,4 +4967,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5455,6 +5466,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5572,5 +5583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5823,5 +5834,5 @@ msgstr "A opción de configuración {0} foi eliminada porque xa non se usa." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5829,10 +5840,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Ver" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5840,5 +5851,5 @@ msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5846,5 +5857,5 @@ msgstr "Axustes prestablecidos" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5855,5 +5866,5 @@ msgstr "Menú: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6262,7 +6273,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" "As seguinte primitivas non poden ser copiadas á primitiva de destino
" @@ -6270,5 +6282,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Misturando primitivas borradas fallou" @@ -6550,8 +6563,10 @@ msgstr "Referenciado por:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(ningún)" @@ -6591,5 +6606,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitiva" @@ -6827,6 +6841,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6837,5 +6851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7047,5 +7061,4 @@ msgstr "Abrir unha lista con todos os comandos (desfacer buffer)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7056,5 +7069,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7062,7 +7075,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7095,9 +7109,9 @@ msgstr "Conflictos: {0} sen resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7105,5 +7119,5 @@ "superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7686,11 +7700,11 @@ msgstr "Facer click para minimizar/maximizar o contido do panel" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autores" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "" @@ -7705,5 +7719,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Escoller primitivas presentadas por este usuario" @@ -7775,4 +7790,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Arranxar" @@ -7999,5 +8015,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Descargar e amosar a historia das primitivas escollidas" @@ -8034,5 +8051,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "" "Axustar a visulización das primitivas correspondentes na capa de datos actual" @@ -9169,6 +9187,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9672,6 +9691,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Lanzar navegador coa axuda da wiki para o obxeto escollido" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9724,8 +9743,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"A relación filla
{0}
está borrada no servidor. Non pode ser " -"cargada" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9815,10 +9832,11 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Varios membros referidos á mesma primitiva" @@ -9835,6 +9853,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Engadir todas as primitivas escollidas no conxunto de cambios actual antes " @@ -9842,6 +9860,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Engadir todas as primitivas escollidas no conxunto de cambios actual despois " @@ -9849,6 +9867,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9857,6 +9876,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9865,5 +9885,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "" "Borrar todas as referencias dos membros a unha das primitivas escollidas" @@ -9876,13 +9897,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "Escoller relación na selección actual" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Escoller membros da relación na selección actual que se refiren {0} " @@ -9890,5 +9910,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Escoller primitivas para os membros das relacións escollidos" @@ -9988,8 +10009,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -10040,12 +10062,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Está a estabelecer unha regra baleira en {0} primitiva." msgstr[1] "Está a estabelecer unha regra baleira en {0} primitivas." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Esto é igual a borrar os papeis de esas primitivas" @@ -10334,6 +10357,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Premer para descargar a área escollida actualmente" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10345,5 +10368,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10427,4 +10450,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10510,5 +10534,6 @@ msgstr "Navegador de axuda de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10516,17 +10541,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

O contido de axuda para tema non existe

O contído de axuda para o tema de axuda" -"{0} aínd anon está dispoñible. Falta tanto na túa lingua ({1}) e en " -"inglés.

Axuda a millorar o sistema de axuda enchendo a información " -"faltante. Pode tanto ediitar o tema de axuda no seu idioma " -"local ({1}) e o tema de axuda en inglés.

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10537,5 +10556,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10544,19 +10563,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Fallou ao abrir a URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10566,33 +10585,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Ir a páxina de axuda de JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Non se puidio abrir a páxina de axuda. A URL estaba valeira." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Fallou ao abrir la páxina de axuda" @@ -10713,4 +10732,8 @@ msgid "Relation {0}" msgstr "Relación {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Obxecto" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10831,5 +10854,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Detectaronse conflictos" @@ -11473,13 +11496,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Preparando datos..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11613,13 +11638,4 @@ msgstr "O conxunto de cambios está cheo" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11628,5 +11644,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11819,4 +11835,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11898,5 +11915,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12114,23 +12131,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "fora da área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12139,11 +12156,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Premer para pechar o diálogo e continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12152,32 +12169,32 @@ msgstr[1] "{0} borrados" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "Non estabelecido" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Versión da API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12895,6 +12912,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12918,7 +12935,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12933,5 +12950,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13854,4 +13871,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Ningún" @@ -13968,17 +13986,13 @@ msgstr "Debuxo rápido (peor resultado)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" -"Só consellos acerca de direccións interesantes (p.e. coa etiqueta de " -"dirección única)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Só no extremo da vía." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14140,15 +14154,20 @@ msgstr "Puntos GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Debuxar consellos de dirección para segmentos de vía." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Debuxar os números de orde de todos os segmentos dentro da súa liña." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -14157,10 +14176,10 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Debuxar os límites dos datos cargados dende o servidor." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14169,9 +14188,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Debuxar as capas de datos inactivas nunha cor diferente." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14179,5 +14198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Datos OSM" @@ -15438,4 +15457,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Validar" @@ -16069,5 +16089,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -16121,9 +16141,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Esta versión de JOSM é incompatible co servidor configurado." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16132,21 +16152,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16154,69 +16174,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Esperabase un id de un conxunto de cambios>0. Obtívose {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Pechando colección de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17829,5 +17849,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19743,5 +19763,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19993,4 +20013,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20682,5 +20703,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20784,4 +20805,8 @@ msgstr "Unha das vias seleccionadas xa é parte de outro multipoligono." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20979,22 +21004,22 @@ msgstr "Executable de firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21627,4 +21652,14 @@ #: build/trans_presets.java:691 msgid "Waypoints" +msgstr "" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Editor de Relación: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" msgstr "" @@ -22766,4 +22801,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22955,11 +23046,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24518,6 +24602,11 @@ msgstr "Coinvirte de forma sinxela un área a un multipolígono." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24531,10 +24620,10 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -24542,5 +24631,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24549,5 +24638,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24557,10 +24646,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "Importar ficheiro PDF e convertir vías." #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24572,5 +24661,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24581,15 +24670,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "O gran JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24599,20 +24688,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "Engadir o elemento "Reiniciar JOSM; ao menú Ficheiro." #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Complemento para desfacer conxuntos de cambios" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24626,5 +24715,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24636,15 +24725,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamento." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24657,15 +24746,15 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "Crear e editar mapas do mar para OpenSeaMap" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -24674,5 +24763,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24685,15 +24774,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Crea edificion entre medianeras a partires de bloques únicos" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24704,5 +24793,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24713,10 +24802,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "Engadido para asinar dixitalmente Datos de OSM" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24727,15 +24822,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "Permite desfacer o borrado de obxetos da base de datos de OSM" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "Algunhas utilidades que farán a túa vida mais sinxela" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24745,5 +24840,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24754,5 +24849,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -24760,15 +24855,15 @@ #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "Escolle unha secuencia de vías conectadas non ramificadas" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40192,4 +40287,333 @@ msgstr "Proba" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "nombre abreviado da rúa" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "Nodo etiquetado como vía unidireccional" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "Nodo etiquetado como ponte" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "Nodo con etiqueta de vía errónea" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Vía sen clasificar sen nombre" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "via sen referencia" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "Tipo de via temporal" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "Nome de clave mal escrito" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "vía ciclista con etiqueta bicicleta" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "vía peatonal con etiqueta a pé" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "carril bici etiquetado como vía ciclable" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "Barreira usada nunha vía" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "velocidad máxima usada nunha rúa peatonal" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "etiqueta capa co signo +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "O nome da rua contén ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relación sin tipo" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurante sen nome" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "combinación de etiquetas inusual" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (espello)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Satélite" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Ruas NRW Geofabrik.de de Renania del Norte-Westfalia" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "Mapas NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Mapas (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Xapón (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Xapón (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Xapón (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Xapón (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italia" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicilia - Italia" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - Italia" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps (Francia)" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "a {0} primitiva" +#~ msgstr[1] "a {0} primitivas" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Restaurar {0} primitiva" +#~ msgstr[1] "Restaurar {0} primitivas" + #~ msgid "Do not show again" #~ msgstr "Non amosar de novo" @@ -40210,7 +40634,4 @@ #~ msgstr "Asegúrate de incluir a seguinte información:" -#~ msgid "Preparing data..." -#~ msgstr "Preparando datos..." - #~ msgid "Error during parse." #~ msgstr "Erro durante a análise." @@ -40368,7 +40789,4 @@ #~ msgstr "Membros: {0}" -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editor de Relación: {0}" - #~ msgid "Error parsing server response." #~ msgstr "Erro analizando a resposta do servidor." @@ -40379,7 +40797,4 @@ #~ msgid "Click Reload to refresh list" #~ msgstr "Fai click en Recargar para actualizar a lista" - -#~ msgid "Object" -#~ msgstr "Obxecto" #~ msgid "" @@ -40538,4 +40953,9 @@ #~ msgid "Create non-audio markers when reading GPX." #~ msgstr "Crear marcas non auditivas ó ler GPX." + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "" +#~ "Só consellos acerca de direccións interesantes (p.e. coa etiqueta de " +#~ "dirección única)." #~ msgid "" @@ -41784,28 +42204,4 @@ #~ msgstr "UTM20 sistema geodesico del norte" -#~ msgid "NPE Maps" -#~ msgstr "Mapas NPE" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Xapón (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Xapón (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Xapón (ORTHO02)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italia" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicilia - Italia" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Xapón (ORTHO03)" - #~ msgid "Set width of building" #~ msgstr "Establecer ancho de edificios" @@ -41844,16 +42240,4 @@ #~ msgid "Settings for the Remote Control plugin." #~ msgstr "Configuración do engadido Control Remoto" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Mapas (Tim)" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" #~ msgid "Terraserver Urban" @@ -41917,73 +42301,4 @@ #~ msgstr "Sí, reiniciar o id" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Ruas NRW Geofabrik.de de Renania del Norte-Westfalia" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "unusual tag combination" -#~ msgstr "combinación de etiquetas inusual" - -#~ msgid "barrier used on a way" -#~ msgstr "Barreira usada nunha vía" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - -#~ msgid "street name contains ss" -#~ msgstr "O nome da rua contén ss" - -#~ msgid "maxspeed used for footway" -#~ msgstr "velocidad máxima usada nunha rúa peatonal" - -#~ msgid "layer tag with + sign" -#~ msgstr "etiqueta capa co signo +" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Satélite" - -#~ msgid "relation without type" -#~ msgstr "relación sin tipo" - -#~ msgid "restaurant without name" -#~ msgstr "restaurante sen nome" - -#~ msgid "bridge tag on a node" -#~ msgstr "Nodo etiquetado como ponte" - -#~ msgid "oneway tag on a node" -#~ msgstr "Nodo etiquetado como vía unidireccional" - -#~ msgid "highway without a reference" -#~ msgstr "via sen referencia" - -#~ msgid "misspelled key name" -#~ msgstr "Nome de clave mal escrito" - -#~ msgid "temporary highway type" -#~ msgstr "Tipo de via temporal" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Vía sen clasificar sen nombre" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "Nodo con etiqueta de vía errónea" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "vía ciclista con etiqueta bicicleta" - -#~ msgid "footway with tag foot" -#~ msgstr "vía peatonal con etiqueta a pé" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "carril bici etiquetado como vía ciclable" - #~ msgid "Error: Unexpected line ''{0}'' in bookmark list from server" #~ msgstr "Erro: Liña inesperada \"{0}\" na lista de marcadores do servidor" @@ -42002,7 +42317,4 @@ #~ "Fallou ao cargar os marcadores de \"{0}\" por motivos de seguridade. A " #~ "Excepción foi: {1}" - -#~ msgid "abbreviated street name" -#~ msgstr "nombre abreviado da rúa" #~ msgid "standard" @@ -42266,4 +42578,7 @@ #~ msgstr "Ampliación automática: " +#~ msgid "Click do download the currently selected area" +#~ msgstr "Premer para descargar a área escollida actualmente" + #~ msgid "replaced by {0} plugin" #~ msgstr "reemplazado polo complemento {0}" @@ -42313,16 +42628,34 @@ #~ msgstr "Permitir control remoto (require o complemento remotecontrol)" -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (espello)" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - Italia" - -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps (Francia)" - #~ msgid "Unable to read autosaved osm data ({0}) - {1}" #~ msgstr "Non foi posíbel ler os datos de osm autogardados ({0}) - {1}" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Lanzar navegador coa axuda da wiki para o obxeto escollido" + +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "A relación filla
{0}
está borrada no servidor. Non pode ser " +#~ "cargada" + +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

O contido de axuda para tema non " +#~ "existe

O contído de axuda para o tema de " +#~ "axuda{0} aínd anon está dispoñible. Falta tanto na túa " +#~ "lingua ({1}) e en inglés.

Axuda a millorar o sistema de axuda " +#~ "enchendo a información faltante. Pode tanto ediitar o tema de axuda no seu idioma local ({1}) e o tema de axuda en inglés.

" + #~ msgid "Seamarks" #~ msgstr "Marcas do mar" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 25650) +++ /applications/editors/josm/i18n/po/he.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2010-11-27 04:20+0000\n" "Last-Translator: bastik \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:15+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:25+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "עזרה" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "אזהרה" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "הפרמטר \"downloadgps\" אינו מקבל שמות קובץ או כתובות URL של קבצים" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -125,13 +125,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/Main.java:759 +msgid "Exit JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:760 +msgid "Continue, try anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:761 -msgid "Exit JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:762 -msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -152,4 +152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -191,18 +192,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -221,4 +222,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "אודות" @@ -305,8 +308,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "אזהרה: פורמט URL בסיס לא צפוי של ה-API, סביר כי ההפניה מחדש לדפי המידע או " @@ -410,4 +413,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -490,5 +494,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -577,6 +581,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -619,51 +623,51 @@ msgstr "נא בחר לפחות שלושה צמתים." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "נתונים" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "שכבה" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "בחירה" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "התנגשות" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "הורד" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "הקודם" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "הבא" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "לא נבחר פריט להתקרבות." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "התקרב אל {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "קרב את התצוגה לכדי {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -673,5 +677,5 @@ msgstr "תצוגה: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "אין התנגשויות להתמקד בהם" @@ -970,9 +974,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "פתח את רשימת האנשים שעובדים על העצמים הנבחרים." + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -981,5 +986,5 @@ msgstr "שכפל" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "שכפל את הבחירה על ידי העתקה והדבקה מיידית." @@ -1087,5 +1092,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1440,6 +1445,7 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" -msgstr "" +#, fuzzy +msgid "Merge the currently selected objects into another layer" +msgstr "מזג את השכבה הנוכחית לתוך שכבה אחרת" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1702,7 +1708,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1725,9 +1731,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "שנה עצם {0}" +msgstr[1] "שנה {0} עצמים" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1840,4 +1846,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2748,5 +2755,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2754,4 +2761,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3346,5 +3354,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3359,5 +3367,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3564,9 +3572,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "שנה עצם {0}" +msgstr[1] "שנה {0} עצמים" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3862,5 +3870,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3918,8 +3926,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4073,5 +4082,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "רקע" @@ -4770,5 +4779,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4782,4 +4791,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5275,6 +5285,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5392,5 +5402,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5635,5 +5645,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5641,10 +5651,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5652,5 +5662,5 @@ msgstr "כלים" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5658,5 +5668,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5667,5 +5677,5 @@ msgstr "תפריט: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "שמע" @@ -6053,10 +6063,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +msgid "Merging deleted objects failed" msgstr "" @@ -6319,8 +6329,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(לא כלום)" @@ -6360,5 +6372,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6592,6 +6603,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6602,5 +6613,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6785,5 +6796,4 @@ msgstr "פתח את רשימת הפקודות המלאה (חוצץ ביטול)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6794,5 +6804,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6800,7 +6810,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6831,13 +6842,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "פתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7410,11 +7421,11 @@ msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "מחברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "פתח את רשימת האנשים שעובדים על העצמים הנבחרים." @@ -7428,5 +7439,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7494,4 +7505,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "תקן" @@ -7713,6 +7725,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "הצג את ההיסטוריה של כל הפריטים הבחורים." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7748,5 +7761,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +msgid "Zoom to the corresponding objects in the current data layer" msgstr "" @@ -8880,5 +8893,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9350,5 +9363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9402,5 +9415,5 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9490,10 +9503,10 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9507,16 +9520,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +msgid "Add all objects selected in the current dataset before the first member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +msgid "Add all objects selected in the current dataset after the last member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9524,11 +9535,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 msgid "" -"Add all primitives selected in the current dataset after the last selected " +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "פתח את רשימת האנשים שעובדים על העצמים הנבחרים." #. putValue(NAME, tr("Remove Selected")); @@ -9539,6 +9551,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9546,11 +9557,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "מחק את היחס הנבחר" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9642,8 +9653,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9695,11 +9707,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -9976,5 +9988,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -9987,5 +9999,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10069,4 +10081,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10151,5 +10164,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10157,11 +10171,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10172,5 +10186,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10179,19 +10193,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10201,33 +10215,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10339,4 +10353,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "פריט" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10449,5 +10467,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "" @@ -11080,13 +11098,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "מכין נתונים..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11217,13 +11237,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11232,5 +11243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11423,4 +11434,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11502,5 +11514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11716,23 +11728,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "שכבת נתונים {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "גירסה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11741,11 +11753,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11754,32 +11766,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "גירסת API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12499,6 +12511,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12522,7 +12534,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12537,5 +12549,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13430,4 +13442,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "" @@ -13544,15 +13557,13 @@ msgstr "ציור מהיר (נראה מכוער יותר)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "רק בראשית הדרך" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13699,34 +13710,39 @@ msgstr "נקודות GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "צייר רמזי כיוון עבור קטעי דרך." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "צייר את גבולות המידע שמורד מהשרת." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13734,5 +13750,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "נתוני OSM" @@ -14978,4 +14994,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "בדוק תקינות" @@ -15607,5 +15624,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15659,9 +15676,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15670,21 +15687,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15692,69 +15709,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17290,5 +17307,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19187,5 +19204,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19437,4 +19454,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20125,5 +20143,5 @@ msgstr "" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20227,4 +20245,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20416,22 +20438,22 @@ msgstr "קובץ הרצת פיירפוקס" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21065,4 +21087,14 @@ msgid "Waypoints" msgstr "ציון דרך" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "עורך יחסים: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22200,4 +22232,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22387,11 +22475,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -23928,6 +24009,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -23937,15 +24023,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -23953,5 +24039,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -23959,10 +24045,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -23971,5 +24057,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -23978,15 +24064,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -23994,20 +24080,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24017,5 +24103,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24024,15 +24110,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24042,20 +24128,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24065,15 +24151,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24082,5 +24168,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24089,10 +24175,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24101,15 +24193,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24119,5 +24211,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24126,20 +24218,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39561,4 +39653,323 @@ msgstr "ניסיון" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "שםרחוב מקוצר" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "תג חד-סטרי על נקודה" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "תג גשר על נקודה" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "תווית דרך מהירה שגויה לנקודה" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "דרך מהירה ללא תווית מזהה" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "סוג דרך מהירה זמני" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "שגיאת כתיב בשם מפתח" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "דרך אופניים ללא תווית \"אופניים\"" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "שביל להולכי רגל ללא תווית \"רגל\"" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "מחסום מוגדר על דרך" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "מהירות מירבית מוגדרת לשביל להולכי רגל" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "תווית שכבה עם סימן +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "שם רחוב מכיל ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "מסעדה בלי שם" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "צירוף תגיות לא רגיל" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Move" #~ msgstr "הזז" @@ -39714,7 +40125,4 @@ #~ msgid "my version:" #~ msgstr "הגירסה שלי:" - -#~ msgid "Object" -#~ msgstr "פריט" #~ msgid "Faster Forward" @@ -39865,7 +40273,4 @@ #~ "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר." -#~ msgid "Preparing data..." -#~ msgstr "מכין נתונים..." - #~ msgid "Error during parse." #~ msgstr "שגיאה בזמן הניתוח." @@ -40044,13 +40449,4 @@ #~ msgstr "סיסמת שרת פרוקסי" -#~ msgid "unusual tag combination" -#~ msgstr "צירוף תגיות לא רגיל" - -#~ msgid "abbreviated street name" -#~ msgstr "שםרחוב מקוצר" - -#~ msgid "restaurant without name" -#~ msgstr "מסעדה בלי שם" - #~ msgid "confirm all Remote Control actions manually" #~ msgstr "אשר את כל פעולות השלט רחוק ידנית" @@ -40231,13 +40627,4 @@ #~ msgstr "סטנדרטי" -#~ msgid "bridge tag on a node" -#~ msgstr "תג גשר על נקודה" - -#~ msgid "oneway tag on a node" -#~ msgstr "תג חד-סטרי על נקודה" - -#~ msgid "misspelled key name" -#~ msgstr "שגיאת כתיב בשם מפתח" - #~ msgid "requested: {0}" #~ msgstr "התבקש: {0}" @@ -40340,4 +40727,7 @@ #~ msgid "Open the OpenStreetBugs window and activate the automatic download" #~ msgstr "פתח את חלון OpenStreetBugs והפעל את ההורדה האוטומטית" + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)." #~ msgid "" @@ -40436,31 +40826,4 @@ #~ msgstr "בחר משתמש בעזרת פאנל המחברים" -#~ msgid "wrong highway tag on a node" -#~ msgstr "תווית דרך מהירה שגויה לנקודה" - -#~ msgid "highway without a reference" -#~ msgstr "דרך מהירה ללא תווית מזהה" - -#~ msgid "temporary highway type" -#~ msgstr "סוג דרך מהירה זמני" - -#~ msgid "barrier used on a way" -#~ msgstr "מחסום מוגדר על דרך" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "דרך אופניים ללא תווית \"אופניים\"" - -#~ msgid "footway with tag foot" -#~ msgstr "שביל להולכי רגל ללא תווית \"רגל\"" - -#~ msgid "street name contains ss" -#~ msgstr "שם רחוב מכיל ss" - -#~ msgid "maxspeed used for footway" -#~ msgstr "מהירות מירבית מוגדרת לשביל להולכי רגל" - -#~ msgid "layer tag with + sign" -#~ msgstr "תווית שכבה עם סימן +" - #~ msgid "Boat" #~ msgstr "סירה" @@ -41005,7 +41368,4 @@ #~ msgstr "הורד" -#~ msgid "Relation Editor: {0}" -#~ msgstr "עורך יחסים: {0}" - #~ msgid "Hint: Some changes came from uploading new data to the server." #~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת." Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 25650) +++ /applications/editors/josm/i18n/po/is.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2010-11-27 04:37+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:15+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:27+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Hjálp" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Aðvörun" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -125,13 +125,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/Main.java:759 +msgid "Exit JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:760 +msgid "Continue, try anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:761 -msgid "Exit JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:762 -msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -152,4 +152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -191,18 +192,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -221,4 +222,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Um JOSM..." @@ -308,5 +311,5 @@ msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" @@ -404,4 +407,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -485,5 +489,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -572,6 +576,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -614,51 +618,51 @@ msgstr "Vinsamlegast veldu a.m.k. þrjá hnúta" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "gögnum" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "lagi" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "vali" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "árekstri" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "niðurhali" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Ekkert er valið til að þysja að." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Þysja að {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Þysja að {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -668,5 +672,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "" @@ -968,9 +972,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "Ekki sett: Ekki setja þessi eigindi á valda hluta" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -979,5 +984,5 @@ msgstr "Tvöfalda" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Tvöfalda valið með því að afrita það og líma það aftur." @@ -1085,5 +1090,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1436,5 +1441,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Sameina valda hluti öðru lagi en þeir eru í núna" @@ -1698,7 +1704,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1721,9 +1727,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Breyta {0} hlut" +msgstr[1] "Breyta {0} hlutum" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1836,4 +1842,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2747,5 +2754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2753,4 +2760,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3348,5 +3356,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3361,5 +3369,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3567,9 +3575,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Breyta {0} hlut" +msgstr[1] "Breyta {0} hlutum" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3865,5 +3873,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3921,8 +3929,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4076,5 +4085,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "bakgrunnur" @@ -4769,5 +4778,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4781,4 +4790,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5274,6 +5284,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5391,5 +5401,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5628,5 +5638,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5634,10 +5644,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Sýn" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5645,5 +5655,5 @@ msgstr "Tól" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5651,5 +5661,5 @@ msgstr "Forstillingar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5660,5 +5670,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Hljóð" @@ -6046,10 +6056,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +msgid "Merging deleted objects failed" msgstr "" @@ -6304,8 +6314,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "" @@ -6345,5 +6357,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6577,6 +6588,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6587,5 +6598,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6770,5 +6781,4 @@ msgstr "Sýna lista yfir allar skipanir." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6779,5 +6789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6785,7 +6795,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6816,13 +6827,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Leysa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7397,11 +7408,11 @@ msgstr "Smelltu til að minnka/hámarka innihald stikunnar" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Höfundar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Listi yfir notendur sem breyttu síðast völdum hlutum." @@ -7415,5 +7426,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Velja hluti sem þessi notandi hefur vistað" @@ -7481,4 +7493,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Laga" @@ -7700,6 +7713,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "Ekki sett: Ekki setja þessi eigindi á valda hluta" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7735,5 +7749,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +msgid "Zoom to the corresponding objects in the current data layer" msgstr "" @@ -8867,5 +8881,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9337,5 +9351,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9389,8 +9403,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Undirvenslunum
{0}
hefur verið eytt á þjóninum, ekki er hægt að " -"ná í þau." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9476,8 +9488,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -9487,5 +9499,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Mörg stök benda á sama hlutinn" @@ -9499,16 +9512,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +msgid "Add all objects selected in the current dataset before the first member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +msgid "Add all objects selected in the current dataset after the last member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9516,11 +9527,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 msgid "" -"Add all primitives selected in the current dataset after the last selected " +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Listi yfir notendur sem breyttu síðast völdum hlutum." #. putValue(NAME, tr("Remove Selected")); @@ -9531,6 +9543,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9538,10 +9549,10 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Bæta völdum stökum á vallistann" @@ -9634,8 +9645,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9687,11 +9699,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -9969,5 +9981,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -9980,5 +9992,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10062,4 +10074,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10144,5 +10157,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10150,11 +10164,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10165,5 +10179,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10172,19 +10186,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10194,33 +10208,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10332,4 +10346,9 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +#, fuzzy +msgid "Object" +msgstr "Fjöldi hluta" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10442,5 +10461,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "" @@ -11075,13 +11094,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Veldu hluti til að hlaða upp" #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11212,13 +11233,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11227,5 +11239,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11422,4 +11434,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11499,5 +11512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11709,23 +11722,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Gagnalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11734,11 +11747,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11747,32 +11760,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "Tölfræði um {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API útgáfa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Breyta í GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12484,6 +12497,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12507,7 +12520,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12522,5 +12535,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13415,4 +13428,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Aldrei" @@ -13529,14 +13543,12 @@ msgstr "" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" - -#. only on the head of a way +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 +msgid "Only on the head of a way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 -msgid "Only on the head of a way." +msgid "Draw oneway arrows." msgstr "" @@ -13688,34 +13700,39 @@ msgstr "GPS punktar" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13723,5 +13740,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM gögn" @@ -14968,4 +14985,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Athuga" @@ -15595,5 +15613,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15647,9 +15665,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15658,21 +15676,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15680,69 +15698,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Bý til breytingarsett..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Opnaði breytingarsett {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Uppfæri breytingarsett.." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Uppfæri breytingarsett {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Loka breytingasetti..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17279,5 +17297,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19176,5 +19194,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19426,4 +19444,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20111,5 +20130,5 @@ msgstr "" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20213,4 +20232,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20401,22 +20424,22 @@ msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21050,4 +21073,14 @@ msgid "Waypoints" msgstr "Vegpunktar" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Opna athugunarglugga." + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22185,4 +22218,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22372,11 +22461,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -23911,6 +23993,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -23920,15 +24007,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -23936,5 +24023,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -23942,10 +24029,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -23954,5 +24041,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -23961,15 +24048,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -23977,20 +24064,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24000,5 +24087,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24007,15 +24094,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24025,20 +24112,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24048,15 +24135,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24065,5 +24152,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24072,10 +24159,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24084,15 +24177,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24102,5 +24195,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24109,20 +24202,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39544,4 +39637,323 @@ msgstr "" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "vensl án týpu" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "nafnlaus veitingastaður" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Incorrect password or username." #~ msgstr "Rangt lykilorð eða notandanafn" @@ -39703,7 +40115,4 @@ #~ msgstr "Fjarlægja val úr venslunum" -#~ msgid "relation without type" -#~ msgstr "vensl án týpu" - #~ msgid "name" #~ msgstr "nafn" @@ -39835,7 +40244,4 @@ #~ msgid "Unknown role ''{0}''." #~ msgstr "Óþekkt hlutverk \"{0}\"." - -#~ msgid "Landsat" -#~ msgstr "Landsat" #~ msgid "There are unsaved changes. Discard the changes and continue?" @@ -40156,7 +40562,4 @@ #~ msgid "Slippy Map" #~ msgstr "Gagnvirkt kort" - -#~ msgid "restaurant without name" -#~ msgstr "nafnlaus veitingastaður" #~ msgid "Base Server URL" @@ -40507,2 +40910,9 @@ #~ "{0} hlutir voru fjarlægðir úr gögnunum þínum því þeim hafði verið eytt á " #~ "þjóninum." + +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Undirvenslunum
{0}
hefur verið eytt á þjóninum, ekki er hægt " +#~ "að ná í þau." Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 25650) +++ /applications/editors/josm/i18n/po/it.po (revision 25651) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-01 19:13+0000\n" -"Last-Translator: Martino Barbon \n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-16 15:13+0000\n" +"Last-Translator: dieterdreist \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,15 +13,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:16+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:23+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -31,12 +31,12 @@ msgstr "Aiuto" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -105,15 +105,15 @@ msgstr "Attenzione" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Il parametro \"downloadgps\" non accetta nomi di file o indirizzi URL di file" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorato un indirizzo URL malformato: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -127,13 +127,13 @@ "di JOSM.Maggiori informazioni:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Esci da JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Continua, prova comunque" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -154,4 +154,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -193,18 +194,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -223,4 +224,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Informazioni su JOSM" @@ -307,8 +310,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "ATTENZIONE: formato URL base dell''API inatteso. Il reindirizzamento alla " @@ -414,4 +417,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -495,5 +499,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -582,6 +586,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -624,51 +628,51 @@ msgstr "Selezionare almeno tre nodi." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "dati" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "livello" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "selezione" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflitto" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "scarica" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "precedente" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "successivo" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Nessuna selezione su cui ingrandire la visuale" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Ingrandisci visuale su {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Ingrandisci la visuale su {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -678,5 +682,5 @@ msgstr "Visualizza: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Nessun conflitto su cui ingrandire la visuale" @@ -984,11 +988,12 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "" "Scarica le primitive che hanno come riferimento una delle primitive " "selezionate" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -997,5 +1002,5 @@ msgstr "Duplica" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplica la selezione copiando ed incollalo subito." @@ -1104,5 +1109,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1487,5 +1492,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Unisci le primitive attualmente selezionate con un altro livello" @@ -1768,8 +1774,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "I dati copiati contengono delle primitive incomplete. Quando si incolla le " @@ -1795,9 +1802,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "a {0} primitiva" -msgstr[1] "a {0} primitive" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Elimina {0} oggetto" +msgstr[1] "Elimina {0} oggetti" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1918,4 +1925,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2889,5 +2897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2895,4 +2903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3545,7 +3554,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3559,8 +3568,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Attenzione: Il livello ''{0}'' non esiste più. Non è possibile rimuovere il " @@ -3778,9 +3787,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Ripristina {0} primitiva" -msgstr[1] "Ripristina {0} primitive" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Elimina {0} oggetto" +msgstr[1] "Elimina {0} oggetti" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4104,5 +4113,5 @@ msgstr "Non in cache" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4170,8 +4179,9 @@ msgstr "Manca la destinazione dell''unione di tipo {0} con id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4335,5 +4345,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "sfondo" @@ -5061,5 +5071,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5073,4 +5083,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5556,5 +5567,5 @@ #, java-format msgid "House number {0} at {1}" -msgstr "" +msgstr "Numero civico da {0} a {1}" #. I18n: house number as parameter @@ -5594,6 +5605,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5711,5 +5722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Immagini aeree" @@ -5972,5 +5983,5 @@ "più usata." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5978,10 +5989,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Visualizza" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5989,5 +6000,5 @@ msgstr "Strumenti" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5995,5 +6006,5 @@ msgstr "Preimpostazioni" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -6004,5 +6015,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6413,7 +6424,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" "Le seguenti primitive non possono essere copiate verso la primitiva di " @@ -6422,5 +6434,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Fallita l''unione delle primitive eliminate" @@ -6706,8 +6719,10 @@ msgstr "Referenziato da:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(nessuno/a)" @@ -6747,5 +6762,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitiva" @@ -6992,6 +7006,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -7002,5 +7016,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7217,5 +7231,4 @@ "Visualizza una lista delle operazioni eseguite (buffer di annullamento)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7226,5 +7239,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7232,7 +7245,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7265,9 +7279,9 @@ msgstr "Conflitti: {0} non risolti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Risolvi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7275,5 +7289,5 @@ "sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7641,5 +7655,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88 msgid "MapPaint" -msgstr "" +msgstr "MapPaint" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304 @@ -7700,5 +7714,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:605 msgid "Title:" -msgstr "" +msgstr "Titolo:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:607 @@ -7708,5 +7722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609 msgid "Built-in Style, internal path:" -msgstr "" +msgstr "Stile incorporato, percorso interno:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611 @@ -7716,9 +7730,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:614 msgid "Icon:" -msgstr "" +msgstr "Icona:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:617 msgid "Background:" -msgstr "" +msgstr "Sfondo:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 @@ -7881,11 +7895,11 @@ msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autori" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "" @@ -7901,5 +7915,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Seleziona le primitive caricate da questo utente" @@ -7974,4 +7989,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Correggi" @@ -8200,5 +8216,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Scarica e visualizza lo storico delle primitive selezionate" @@ -8239,5 +8256,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "" "Ingrandisci la visuale sulle primitive corrispondenti nel livello dei dati " @@ -9378,6 +9396,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9907,7 +9926,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "" -"Apre il browser con la documentazione wiki riguardante l''oggetto selezionato" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9962,8 +9980,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"La relazione figlia
{0}
risulta eliminata sul server. Non può " -"essere caricata" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -10055,8 +10071,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -10066,5 +10082,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Più membri fanno riferimento alla stessa primitiva" @@ -10081,6 +10098,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Aggiungi tutte le primitive selezionate nell''insieme di dati corrente prima " @@ -10088,6 +10105,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Aggiungi tutte le primitive selezionate nell''insieme di dati corrente dopo " @@ -10095,6 +10112,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -10103,6 +10121,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -10111,5 +10130,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "" "Rimuovi tutti i membri che si riferiscono ad una delle primitive selezionate" @@ -10122,6 +10142,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "" "Seleziona i membri della relazione che si riferiscono alle primitive nella " @@ -10129,8 +10149,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Seleziona i membri della relazione a cui si riferiscono {0} primitive nella " @@ -10138,5 +10157,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Seleziona le primitive per i membri della relazione selezionata" @@ -10236,12 +10256,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"Il livello ''''{0}'''' contiene già un conflitto per la " -"primitiva
''''{1}''''.
Risolvere prima questo conflitto e quindi " -"riprovare." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" +"Il livello ''{0}'' contiene già un conflitto per l''oggetto
''{1}''." +"
Si prega di risolvere prima questo conflitto, e poi di riprovare." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -10291,12 +10311,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Si sta impostando un ruolo vuoto su {0} primitiva." msgstr[1] "Si sta impostando un ruolo vuoto su {0} primitive." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Questo equivale all''eliminazione dei ruoli di queste primitive." @@ -10604,6 +10625,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Cliccare per scaricare l''area attualmente selezionata" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10615,9 +10636,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Né {0} né {1} sono abilitati." -"
Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure entrambi." +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10700,4 +10718,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10783,5 +10802,6 @@ msgstr "Browser dell''aiuto di JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10789,19 +10809,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

Contenuto mancante per l''argomento di " -"aiuto

Il contenuto per l''argomento di aiuto " -"{0} non è ancora disponibile. E'' assente sia nella propria " -"lingua ({1}) che in inglese.

Si invita ad apportare il proprio " -"contributo per migliorare il sistema di aiuto JOSM ed inserire le " -"informazioni mancanti. E'' possibile modificare l''argomento di aiuto nella propria lingua ({1}) oppure l''argomento in inglese.

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10816,5 +10828,5 @@ "messaggio di errore è (non tradotto):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10826,19 +10838,19 @@ "di controllare
la propria connessione ad internet" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Fallita l''apertura dell''indirizzo URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Apri la pagina di aiuto corrente in un browser esterno" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Modifica la pagina di aiuto corrente" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10851,24 +10863,24 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Ricarica la pagina di aiuto corrente" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Vai alla pagina precedente" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Vai alla pagina successiva" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Vai alla pagina iniziale di aiuto a JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" @@ -10876,5 +10888,5 @@ "Attenzione: posizione errata nel documento HTML. L''eccezione è stata: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" @@ -10882,5 +10894,5 @@ "è vuoto." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Fallita l''apertura della pagina di aiuto" @@ -11002,4 +11014,8 @@ msgid "Relation {0}" msgstr "Relazione {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Oggetto" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -11129,5 +11145,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Rilevati conflitti" @@ -11839,14 +11855,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare " -"questa primitiva e riprovare a caricare." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Attenzione: l''oggetto ''''{0}'''' risulta già eliminato sul server. Salto " +"questo oggetto e riprovo a caricare." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Preparazione delle primitive da caricare ..." @@ -12010,15 +12028,4 @@ msgstr "Gruppo di modifiche pieno" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Attenzione: l''oggetto ''''{0}'''' risulta già eliminato sul server. Salto " -"questo oggetto e riprovo a caricare." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -12029,5 +12036,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -12244,4 +12251,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12324,5 +12332,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12547,19 +12555,19 @@ msgstr "ERRORE" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Livello dati {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "al di fuori dell''area scaricata" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "versione {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -12567,5 +12575,5 @@ "nella versione 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12574,11 +12582,11 @@ msgstr[1] "Sono stati individuati {0} conflitti." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Cliccare per chiudere questa finestra e continuare a modificare" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12587,32 +12595,32 @@ msgstr[1] "{0} eliminati" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "disattiva" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Versione delle API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Converti in un livello GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Controllo consistenza dell'insieme dei dati" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Nessun problema trovato" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Sono stati trovati i seguenti problemi:" @@ -13368,6 +13376,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13399,7 +13407,7 @@ "per i dettagli." -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13416,5 +13424,5 @@ msgstr "Stile di tratteggio non valido, almeno un valore deve essere > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -14460,4 +14468,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Nessuno" @@ -14575,17 +14584,13 @@ msgstr "Disegno veloce (appare più brutto)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" -"Solo per suggerimenti di direzione significativi (es. con etichetta di senso " -"unico)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Solo sull''estremità di un percorso." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14750,10 +14755,15 @@ msgstr "Punti GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Disegna il verso sui segmenti dei percorsi." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "" @@ -14762,5 +14772,5 @@ #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -14768,10 +14778,10 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Disegna i confini dei dati scaricati dal server." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14780,9 +14790,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Disegna con un colore diverso i layer non attivi." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14792,5 +14802,5 @@ "impostazione presente nello stile selezionato." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Dati OSM" @@ -15152,5 +15162,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244 msgid "JOSM Internal Style" -msgstr "" +msgstr "Stile interno di JOSM" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245 @@ -15162,9 +15172,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:249 msgid "Potlatch 2" -msgstr "" +msgstr "Potlatch 2" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:250 msgid "the main Potlatch 2 style" -msgstr "" +msgstr "lo stile principale di Potlatch 2" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 @@ -16182,4 +16192,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Convalida" @@ -16863,7 +16874,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Il server ha risposto con il codice 404, ritento con una richiesta per ogni " @@ -16919,9 +16931,9 @@ msgstr "Preferenza ''''{0}'''' mancante. Impossibile inizializzare OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Questa versione di JOSM non è compatibile con il configurato." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16932,5 +16944,5 @@ "le versioni dalla {0} alla {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." @@ -16939,16 +16951,17 @@ "protocollo" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +"E'' stato rimosso il livello {0} perché non è permesso dalle API configurate." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Formato di ID non atteso restituito dal server. Ottenuto ''''{0}''''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16958,65 +16971,65 @@ "''''{0}''''. Ottenuto ''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Creazione dell''insieme di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Insieme di modifiche {0} aperto con successo" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Era atteso un insieme di modifiche con ID > 0. Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Aggiornamento dell''insieme di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Aggiornamento dell''insieme di modifiche {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Chiusura del gruppo di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Preparazione della richiesta di caricamento..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Attesa di 10 secondi ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Inizio del ripristino {0} di {1} in {2} secondi ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - nuovo tentativo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Inizio del ripristino {0} di {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Il gruppo di modifiche corrente è nullo. Impossibile caricare i dati." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -17025,5 +17038,5 @@ "{0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17765,5 +17778,5 @@ #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52 msgid "Assume" -msgstr "" +msgstr "Deduci" #: ../core/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java:36 @@ -18201,5 +18214,5 @@ #, java-format msgid "Plugin provided by an external source: {0}" -msgstr "" +msgstr "Estensione resa disponibile da una sorgente esterna: {0}" #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42 @@ -18814,5 +18827,5 @@ msgstr "Errore alla linea " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "File audio mancante" @@ -20896,5 +20909,5 @@ "una parte del percorso" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "Unione dei perimetri" @@ -21044,10 +21057,10 @@ #, java-format msgid "exttool:{0}" -msgstr "" +msgstr "strumento esterno:{0}" #: ../plugins/ext_tools/src/ext_tools/ExtToolAction.java:24 #, java-format msgid "External Tool: {0}" -msgstr "" +msgstr "Strumento esterno: {0}" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46 @@ -21152,4 +21165,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21382,75 +21396,75 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java:96 msgid "Channel-Digraph created from the active OSM-Layer" -msgstr "" +msgstr "Digrafo dei canali creato dal livello OSM attivo" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:42 msgid "Create Channel Digraph" -msgstr "" +msgstr "Crea digrafo dei canali" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:68 msgid "this layer is no osm data layer" -msgstr "" +msgstr "il livello non è un livello dati osm" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:81 msgid "Converting OSM graph into Channel Digraph" -msgstr "" +msgstr "Conversione del grafo OSM in un digrafo dei canali" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:110 msgid "filtering ways" -msgstr "" +msgstr "filtraggio dei percorsi" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:119 msgid "creating Channel-Digraph" -msgstr "" +msgstr "creazione del digrafo dei canali" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:127 msgid "sealing Digraph" -msgstr "" +msgstr "chiusura Digrafo" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:135 msgid "calculating Strong Connectedness" -msgstr "" +msgstr "calcolo delle connessioni forti" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:139 msgid "creating DigraphLayer" -msgstr "" +msgstr "creazione del livello del digrafo" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47 msgid "JunctionChecking" -msgstr "" +msgstr "Verifica dei collegamenti" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47 msgid "Open the junctionchecking window." -msgstr "" +msgstr "Apri la finestra di verifica dei collegamenti." #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 msgid "junctions" -msgstr "" +msgstr "collegamenti" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:53 msgid "Channel-Digraph creation" -msgstr "" +msgstr "Creazione del digrafo dei canali" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:54 msgid "seal Channel Digraph" -msgstr "" +msgstr "chiudi digrafo dei canali" #. digraphPanel.add(digraphsealcb); #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:58 msgid "calculate strong connected channels" -msgstr "" +msgstr "calcola gli archi con connessione forte" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:64 msgid "Junctionchecking/junctions searching" -msgstr "" +msgstr "Verifica/ricerca dei collegamenti" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:70 msgid "order of junction (n):" -msgstr "" +msgstr "ordine del collegamento (n):" #. Elemente zur OSM-Relationen-Erzeugung #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:76 msgid "produce OSM-Relations: junction" -msgstr "" +msgstr "produci relazioni OSM: junction" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:77 @@ -21458,40 +21472,42 @@ "if enabled the plugin produces osm-relations from the junction subgraphs" msgstr "" +"se abilitato l''estensione produce delle relazioni osm dai sottografi del " +"collegamento" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "Create" -msgstr "" +msgstr "Crea" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "start the channel digraph creation" -msgstr "" +msgstr "inizia la creazione del digrafo dei canali" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:92 msgid "create the channel digraph" -msgstr "" +msgstr "crea il digrafo dei canali" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94 msgid "Check " -msgstr "" +msgstr "Verifica " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94 msgid "check a marked subset if it is a junction" -msgstr "" +msgstr "verifica un sottoinsieme contrassegnato se è un collegamento" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:95 msgid "check the subust for junction properties" -msgstr "" +msgstr "verifica le proprietà del collegamento nel sottoinsieme" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 msgid "Search " -msgstr "" +msgstr "Ricerca " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 msgid "search for junctions into a subset of channels" -msgstr "" +msgstr "ricerca i collegamenti in un sottoinsieme di canali" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:99 msgid "search for junctions in the channel subset" -msgstr "" +msgstr "ricerca i collegamenti nel sottoinsieme del canale" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:55 @@ -21500,25 +21516,28 @@ "candidat mark these channel and press the \"Check\" button again." msgstr "" +"I canali contrassegnati contengono un candidato a collegamento (bianco). Per " +"provare questo candidato contrassegna questo collegamento è premi nuovamente " +"il tasto \"Verifica\"." #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:59 #, java-format msgid "The marked channels are a {0}-ways junction" -msgstr "" +msgstr "I canali contrassegnati sono un collegamento a {0}-vie" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:69 msgid "The marked channels are not a junction:" -msgstr "" +msgstr "I canali contrassegnati non sono un collegamento:" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java:44 msgid "construct channel digraph and search for junctions" -msgstr "" +msgstr "costruisci un digrafo dei canali e cerca i collegamenti" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java:55 msgid "Number of {0]-ways junctions found: " -msgstr "" +msgstr "Numero di collegamenti a {0]-vie trovati: " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java:83 msgid "generate all combinations from entrie/exit candidates" -msgstr "" +msgstr "genera tutte le combinazioni dai candidati ad entrata/uscita" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69 @@ -21862,5 +21881,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "Apri MapDust" @@ -21970,4 +21989,8 @@ "Uno dei percorsi selezionati appartiene già ad un altro multi-poligono." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -22176,22 +22199,22 @@ msgstr "Eseguibile di Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "Errore nella trasformazione: X minimo deve essere minore del massimo" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "Errore nella trasformazione: Y minimo deve essere minore del massimo" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "Errore nella trasformazione: punti troppo vicini" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Errore nella trasformazione: variante non supportata" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Errore nella trasformazione: orientamento non supportato" @@ -22203,9 +22226,9 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238 msgid "Select projection..." -msgstr "" +msgstr "Seleziona proiezione..." #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:243 msgid "Prefs" -msgstr "" +msgstr "Preferenze" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:246 @@ -22306,13 +22329,14 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:431 msgid "Projection Preferences" -msgstr "" +msgstr "Preferenze della proiezione" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:478 msgid "Close the dialog and apply projection preferences" -msgstr "" +msgstr "Chiudi la finestra ed applica le preferenze della proiezione" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:491 msgid "Close the dialog, discard projection preference changes" msgstr "" +"Chiudi la finestra ed annulla le modifiche alle preferenze della proiezione" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:544 @@ -22755,14 +22779,14 @@ #, java-format msgid "Selected: {0}" -msgstr "" +msgstr "Selezionata: {0}" #. TODO: include description in string #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:210 msgid "Proj4J: " -msgstr "" +msgstr "Proj4J: " #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 msgid "Code" -msgstr "" +msgstr "Codice" #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 @@ -22835,4 +22859,14 @@ msgid "Waypoints" msgstr "Punti del percorso" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Editor relazione: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23938,5 +23972,5 @@ #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:501 msgid "Trusted persons told me" -msgstr "" +msgstr "Le persone di fiducia mi hanno detto" #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:504 @@ -24016,4 +24050,60 @@ msgstr "Crea una nuova chiave di firma" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -24231,13 +24321,4 @@ "html>" -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." -msgstr "" -"Il livello ''{0}'' contiene già un conflitto per l''oggetto
''{1}''." -"
Si prega di risolvere prima questo conflitto, e poi di riprovare." - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -25421,5 +25502,5 @@ msgctxt "Place type" msgid "city" -msgstr "" +msgstr "città (> 100.000 abitanti)" #. relation place type @@ -25427,5 +25508,5 @@ msgctxt "Place type" msgid "locality" -msgstr "" +msgstr "località non abitata" #. relation place type @@ -25433,5 +25514,5 @@ msgctxt "Place type" msgid "village" -msgstr "" +msgstr "insediamento urbano (< 10.000 abitanti)" #. relation place type @@ -25439,5 +25520,5 @@ msgctxt "Place type" msgid "town" -msgstr "" +msgstr "città (10.000-100.000 abitanti)" #. relation place type @@ -25445,5 +25526,5 @@ msgctxt "Place type" msgid "borough" -msgstr "" +msgstr "distretto (non in Italia)" #. relation place type @@ -25451,5 +25532,5 @@ msgctxt "Place type" msgid "municipality" -msgstr "" +msgstr "comune" #. relation place type @@ -25457,5 +25538,5 @@ msgctxt "Place type" msgid "island" -msgstr "" +msgstr "isola" #. relation place type @@ -25463,5 +25544,5 @@ msgctxt "Place type" msgid "county" -msgstr "" +msgstr "contea (non in Italia)" #. relation place type @@ -25469,5 +25550,5 @@ msgctxt "Place type" msgid "hamlet" -msgstr "" +msgstr "nucleo indipendente di poche case" #. relation place type @@ -25475,5 +25556,5 @@ msgctxt "Place type" msgid "suburb" -msgstr "" +msgstr "quartiere" #. Strings in JFileChooser @@ -25881,4 +25962,7 @@ "junction or searches in a subset of channels for junctions" msgstr "" +"crea un digrafo dei canali e verifica un sottoinsieme di canali se " +"rappresenta un collegamento oppure ricerca i collegamenti in un sottoinsieme " +"di canali" #. Plugin lakewalker @@ -25918,6 +26002,11 @@ msgstr "Converti semplicemente un''area in un multi-poligono." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25931,15 +26020,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "opzioni avanzate per la modifica degli orari di apertura" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importa le segnalazioni da OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25949,5 +26038,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25957,10 +26046,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "Importa file PDF e converti in percorsi." #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25971,5 +26060,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25980,15 +26069,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Il grande aspetto e stile JGoodies Plastic." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" -msgstr "" +msgstr "aggiungi proiezioni da Proj4J" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25998,20 +26087,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "Aggiunge la voce "Riavvia JOSM" al menu File." #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Estensione per il ripristino dei gruppi di modifiche" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "Utilizza rgis.spb.ru image come copertura" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -26025,5 +26114,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -26035,15 +26124,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Fornisce funzioni di navigazione" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "Permette l''esecuzione degli script in JOSM." #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -26056,20 +26145,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "Crea e modifica mappe nautiche per OpenSeaMap" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -26083,15 +26172,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Costruisce un complesso di edifici a partire da singoli blocchi." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "Crea e modifica le caratteristiche nautiche per OpenSeaMap" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -26103,5 +26192,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -26112,10 +26201,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "Estensione per firmare digitalmente i dati OSM" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -26126,15 +26221,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "Permette di ripristinare un oggetto dal database di OSM" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "Alcuni strumenti per facilitarsi la vita." #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -26147,5 +26242,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -26157,5 +26252,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -26163,15 +26258,15 @@ #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "Abilita la ricerca di un punto del percorso importato da un file gpx." #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 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:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -32536,5 +32631,5 @@ #: build/trans_presets.java:1930 build/trans_presets.java:2005 msgid "Microbrewery" -msgstr "Microbirreria" +msgstr "Microbirrificio" #. item "Food+Drinks/Fast Food" @@ -32899,5 +32994,5 @@ #: build/trans_presets.java:2176 msgid "Dog Park" -msgstr "" +msgstr "Area per cani" #. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "abbreviazione del nome della strada" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "etichetta di senso unico presente su un nodo" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "nodo etichettato come ponte (bridge)" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "etichetta stradale errata su un nodo" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Strada non classificata priva di nome" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "strada senza un riferimento" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "tipo di strada temporaneo" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "nome della chiave errata" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "pista ciclabile con etichetta bicycle" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "footway con etichetta foot" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "cycleway separata come corsia su cycleway" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "barriera usata su un percorso" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "velocità massima per footway" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "etichetta del livello con il segno +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "il nome della strada contiene ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relazione senza tipo" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "ristorante senza nome" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "combinazione di etichette insolito" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (mirror)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Satellite" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "Mappe NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "Mappe NPE (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7a Serie (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Giappone (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Giappone (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Giappone (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Giappone (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italia" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicilia - Italia" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - Italia" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps (Francia)" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "a {0} primitiva" +#~ msgstr[1] "a {0} primitive" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Ripristina {0} primitiva" +#~ msgstr[1] "Ripristina {0} primitive" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Il livello ''''{0}'''' contiene già un conflitto per la " +#~ "primitiva
''''{1}''''.
Risolvere prima questo conflitto e quindi " +#~ "riprovare." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. " +#~ "Ignorare questa primitiva e riprovare a caricare." + #~ msgid "No data imported." #~ msgstr "Nessun dato importato." @@ -41741,7 +42180,4 @@ #~ msgid "Click Reload to refresh list" #~ msgstr "Fare clic su Ricarica per aggiornare la lista" - -#~ msgid "Object" -#~ msgstr "Oggetto" #~ msgid "" @@ -42034,7 +42470,4 @@ #~ msgstr "Membri: {0}" -#~ msgid "Landsat" -#~ msgstr "Landsat" - #~ msgid "Select, move and rotate objects" #~ msgstr "Seleziona, muovi e ruota gli oggetti." @@ -42221,7 +42654,4 @@ #~ msgid "Dupe {0} nodes into {1} nodes" #~ msgstr "Duplica {0} nodi in {1} nodi" - -#~ msgid "NPE Maps" -#~ msgstr "Mappe NPE" #~ msgid "YAHOO (WebKit)" @@ -42408,10 +42838,4 @@ #~ msgstr "Costo" -#~ msgid "oneway tag on a node" -#~ msgstr "etichetta di senso unico presente su un nodo" - -#~ msgid "layer tag with + sign" -#~ msgstr "etichetta del livello con il segno +" - #~ msgid "Please enter a search string" #~ msgstr "Inserire la stringa da cercare" @@ -42455,7 +42879,4 @@ #~ msgstr "unitarianismo" -#~ msgid "highway without a reference" -#~ msgstr "strada senza un riferimento" - #~ msgid "Request Update" #~ msgstr "Richiesta di aggiornamento" @@ -42466,25 +42887,4 @@ #~ msgid "Edit Football" #~ msgstr "Modifica football" - -#~ msgid "barrier used on a way" -#~ msgstr "barriera usata su un percorso" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "pista ciclabile con etichetta bicycle" - -#~ msgid "temporary highway type" -#~ msgstr "tipo di strada temporaneo" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "etichetta stradale errata su un nodo" - -#~ msgid "misspelled key name" -#~ msgstr "nome della chiave errata" - -#~ msgid "street name contains ss" -#~ msgstr "il nome della strada contiene ss" - -#~ msgid "abbreviated street name" -#~ msgstr "abbreviazione del nome della strada" #~ msgid "" @@ -42618,12 +43018,6 @@ #~ msgstr "Attributo richiesto mancante \"{0}\"" -#~ msgid "footway with tag foot" -#~ msgstr "footway con etichetta foot" - #~ msgid "Footway" #~ msgstr "Footway" - -#~ msgid "maxspeed used for footway" -#~ msgstr "velocità massima per footway" #~ msgid "Cycleway" @@ -42726,7 +43120,4 @@ #~ msgstr "YAHOO (WebKit GTK)" -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - #~ msgid "Drawbridge" #~ msgstr "Ponte levatoio" @@ -42787,7 +43178,4 @@ #~ msgid "Open images with AgPifoJ..." #~ msgstr "Apri immagini con AgPifoJ..." - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "cycleway separata come corsia su cycleway" #~ msgid "" @@ -42900,7 +43288,4 @@ #~ msgstr "Saracinesca" -#~ msgid "bridge tag on a node" -#~ msgstr "nodo etichettato come ponte (bridge)" - #~ msgid "" #~ "The plugin {0} seems to be broken or could not be downloaded " @@ -42964,7 +43349,4 @@ #~ msgstr "Seleziona i dati dell'utente" -#~ msgid "unusual tag combination" -#~ msgstr "combinazione di etichette insolito" - #~ msgid "No useful role ''{0}'' for Way ''{1}''." #~ msgstr "Regola ''{0}'' non utile per il percorso ''{1}''." @@ -43024,10 +43406,4 @@ #~ msgid "Sorry, doesn't work with anonymous users" #~ msgstr "Spiacente, ma non funziona con gli utenti anonimi" - -#~ msgid "relation without type" -#~ msgstr "relazione senza tipo" - -#~ msgid "restaurant without name" -#~ msgstr "ristorante senza nome" #~ msgid "CI" @@ -43058,7 +43434,4 @@ #~ msgstr "Geofabrik.de dell'Alto Palatinato" -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia" - #~ msgid "park_and_ride" #~ msgstr "parcheggio di interscambio" @@ -43147,7 +43520,4 @@ #~ msgid "Please select one or more closed ways of at least four nodes." #~ msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi." - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "Mappe NPE (Tim)" #~ msgid "Style for restriction {0} not found." @@ -43364,7 +43734,4 @@ #~ msgid "Please select at least one closed way the should be joined." #~ msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito." - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editor relazione: {0}" #~ msgid "Solve Conflict" @@ -44329,16 +44696,4 @@ #~ msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" #~ msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Satellite" #~ msgid "" @@ -44881,10 +45236,4 @@ #~ msgstr "Applica anche ai figli" -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - #~ msgid "Travel" #~ msgstr "Viaggio" @@ -45616,4 +45965,12 @@ #~ msgstr "La stringa ''''{0}'''' non è un valore in doppia precisione valido." +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Né {0} né {1} sono abilitati." +#~ "
Scegliere se scaricare i dati OSM, oppure i dati GPX, oppure entrambi." +#~ "" + #~ msgid "Available styles (from {0})" #~ msgstr "Stili disponibili (da {0})" @@ -45747,25 +46104,4 @@ #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" #~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italia" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicilia - Italia" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7a Serie (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Giappone (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Giappone (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Giappone (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Giappone (ORTHO03)" #~ msgid "Missing merge target for object with id {0}" @@ -46719,4 +47055,11 @@ #~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "La relazione figlia
{0}
risulta eliminata sul server. Non può " +#~ "essere caricata" + +#~ msgid "" #~ "Click to to return to the relation editor and to resume relation editing" #~ msgstr "" @@ -46916,4 +47259,22 @@ #~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

Contenuto mancante per l''argomento di " +#~ "aiuto

Il contenuto per l''argomento di aiuto " +#~ "{0} non è ancora disponibile. E'' assente sia nella " +#~ "propria lingua ({1}) che in inglese.

Si invita ad apportare il " +#~ "proprio contributo per migliorare il sistema di aiuto JOSM ed inserire le " +#~ "informazioni mancanti. E'' possibile modificare l''argomento di aiuto nella propria lingua ({1}) oppure l''argomento in inglese.

" + +#~ msgid "" #~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}" #~ msgstr "" @@ -46938,7 +47299,4 @@ #~ msgid "Image not created properly." #~ msgstr "Immagine non creata correttamente." - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Strada non classificata priva di nome" #~ msgctxt "filter" @@ -47198,4 +47556,9 @@ #~ "nodi)." +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "" +#~ "Solo per suggerimenti di direzione significativi (es. con etichetta di " +#~ "senso unico)." + #~ msgid "" #~ "JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last " @@ -47240,10 +47603,4 @@ #~ "Remote Control ha richiesto il caricamento di un livello WMS dal seguente " #~ "indirizzo URL:" - -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (mirror)" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - Italia" #~ msgid "edit time-tag of selcted Element in a graphical interface" @@ -47307,4 +47664,9 @@ #~ msgstr "Aggiungi relazione" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "" +#~ "Apre il browser con la documentazione wiki riguardante l''oggetto " +#~ "selezionato" + #~ msgid "Get Capabilities" #~ msgstr "Recupera funzionalità" @@ -47321,7 +47683,4 @@ #~ msgid "Seanap Editor" #~ msgstr "Editor Seanap" - -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps (Francia)" #~ msgid "used" @@ -47403,4 +47762,7 @@ #~ msgstr "Nomi della strada possibili" +#~ msgid "Click do download the currently selected area" +#~ msgstr "Cliccare per scaricare l''area attualmente selezionata" + #~ msgid "replaced by {0} plugin" #~ msgstr "sostituita dall''estensione {0}" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 25650) +++ /applications/editors/josm/i18n/po/ja.po (revision 25651) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:38+0100\n" -"PO-Revision-Date: 2011-02-19 04:43+0000\n" -"Last-Translator: nori_u \n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-10 01:08+0000\n" +"Last-Translator: ribbon \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,6 +16,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:26+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:21+0000\n" +"X-Generator: Launchpad (build 12617)\n" "X-Poedit-Country: JAPAN\n" "X-Poedit-Language: Japanese\n" @@ -24,10 +24,10 @@ #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -37,12 +37,12 @@ msgstr "ヘルプ" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "不正な形式のファイルURL\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -78,7 +78,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -111,15 +111,15 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "不正な形式のURLの \"{0}\" を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -132,13 +132,13 @@ "バージョンのJOSMを使う事が出来ます。より詳細:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "JOSMを終了" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -159,4 +159,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -198,18 +199,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -228,4 +229,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "情報" @@ -312,8 +315,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のペー" @@ -417,4 +420,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -501,5 +505,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -588,6 +592,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -630,51 +634,51 @@ msgstr "少なくとも3つのノードを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "データ" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "レイヤー" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "競合" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "ダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "前" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "次" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "ズームする対象が選択されていません。" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "{0}へズーム" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "{0}のビューへズーム" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -684,5 +688,5 @@ msgstr "表示: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "ズームの対象になる競合はありません" @@ -983,10 +987,11 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "" "選択したプリミティブの一つを参照しているプリミティブをダウンロードします。" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -995,5 +1000,5 @@ msgstr "複製" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "コピー後すぐに貼り付けで複製" @@ -1101,5 +1106,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1473,5 +1478,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "選択したプリミティブを他のレイヤーに結合" @@ -1744,8 +1750,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "コピーしたデータは不完全なプリミティブを含んでいます。貼り付けると不完全なプ" @@ -1770,8 +1777,8 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "{0} 個のプリミティブまで" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "{0} 個のオブジェクトを削除" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1890,4 +1897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2815,5 +2823,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2821,4 +2829,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -2827,5 +2836,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:104 msgid "Select, move, scale and rotate objects" -msgstr "" +msgstr "オブジェクトの選択、移動、拡大縮小と回転" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:192 @@ -2834,4 +2843,5 @@ msgid_plural "Add and move a virtual new node to {0} ways" msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524 @@ -2875,5 +2885,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:687 msgid "Release the mouse button to stop scaling." -msgstr "" +msgstr "拡大縮小を止めるには、マウスボタンを離します。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:689 @@ -2882,4 +2892,6 @@ "Ctrl to rotate selected; Alt-Ctrl to scale selected; or change selection" msgstr "" +"ドラッグでオブジェクトを移動; Shiftで選択に追加(Ctrlで切替え); Shift-Ctrlで選" +"択対象を回転; Alt-Ctrlで選択対象を拡大縮小; クリックで別のオブジェクトを選択" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:44 @@ -3252,4 +3264,7 @@ "{1}" msgstr "" +"正規表現\"{0}\"に構文エラー、詳細は：\n" +"\n" +"{1}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263 @@ -3449,7 +3464,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3463,8 +3478,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けま" @@ -3644,6 +3659,5 @@ msgid "Scale {0} node" msgid_plural "Scale {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0}ノードを拡大縮小" #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:93 @@ -3674,8 +3688,8 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "{0} 個のプリミティブの削除を取消す" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "{0} 個のオブジェクトを削除" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3989,5 +4003,5 @@ msgstr "キャッシュにありません" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4050,8 +4064,9 @@ msgstr "ID {1} のタイプ {0} の結合対象が見つかりません" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4209,5 +4224,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "背景" @@ -4232,5 +4247,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg3008.java:29 msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)" -msgstr "" +msgstr "SWEREF99 13 30 / EPSG:3008 (スエーデン)" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4380,5 +4395,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:406 msgid "UTM France (DOM)" -msgstr "" +msgstr "UTM France (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:419 @@ -4911,5 +4926,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4923,4 +4938,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5424,6 +5440,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5539,5 +5555,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "画像" @@ -5786,5 +5802,5 @@ msgstr "設定 {0} はもう使われていないので、除かれました。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5792,10 +5808,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "表示" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5803,5 +5819,5 @@ msgstr "ツール" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5809,5 +5825,5 @@ msgstr "プリセット" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5818,5 +5834,5 @@ msgstr "メニュー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "音声" @@ -6218,7 +6234,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" "以下のプリミティブは、対象となるプリミティブにコピーできません。
これは先" @@ -6226,5 +6243,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "削除されたプリミティブの併合に失敗" @@ -6489,8 +6507,10 @@ msgstr "参照元：" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(なし)" @@ -6530,5 +6550,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "プリミティブ" @@ -6761,6 +6780,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6770,5 +6789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6964,5 +6983,4 @@ msgstr "全指示のリストを開く（取り消しバッファ）" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6973,5 +6991,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6979,7 +6997,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7011,13 +7030,13 @@ msgstr "競合: {0} 未解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "上記リストの全てのアイテムを結合するダイアログを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7298,5 +7317,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:487 msgid "Adjust opacity of the layer." -msgstr "" +msgstr "レイヤーの透明度を調整" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:572 @@ -7360,5 +7379,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304 msgid "Turn selected styles on or off" -msgstr "" +msgstr "選択したスタイルの適用を切替え" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339 @@ -7374,9 +7393,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:383 msgid "Reload from file" -msgstr "" +msgstr "ファイルから再読み込み" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:384 msgid "reload selected styles from file" -msgstr "" +msgstr "選択したスタイルをファイルから再読み込み" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:432 @@ -7386,5 +7405,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:433 msgid "Save a copy of this Style to file and add it to the list" -msgstr "" +msgstr "このスタイルのコピーをファイルに保存し、一覧に追加します" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:474 @@ -7404,5 +7423,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:554 msgid "Map Style info" -msgstr "" +msgstr "マップスタイル情報" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:581 @@ -7437,5 +7456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 msgid "Style is currently active?" -msgstr "" +msgstr "このスタイルを利用中？" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 @@ -7592,11 +7611,11 @@ msgstr "クリックすることでパネルの内容を最小化/最大化" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "作者" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "選択したオブジェクトで作業した人たちのリストを開く" @@ -7609,5 +7628,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "このユーザが登録したプリミティブを選択" @@ -7678,4 +7698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "修正" @@ -7899,5 +7920,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "選択したプリミティブの履歴をダウンロードして表示" @@ -7935,5 +7957,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "現在のデータレイヤ中の対応するプリミティブにズーム" @@ -9068,6 +9091,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9559,6 +9583,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Wikiのヘルプをブラウザで開いてオブジェクトを選択" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9610,7 +9634,6 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" -msgstr "" -"子リレーション
{0}
はサーバ上から削除されました。ロードできません" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9698,8 +9721,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" @@ -9709,5 +9732,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "複数のメンバーが同じプリミティブを参照しています" @@ -9723,18 +9747,19 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9743,6 +9768,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9751,5 +9777,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除" @@ -9761,18 +9788,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "選択されたリレーションメンバーのプリミティブを選択" @@ -9870,11 +9897,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." -msgstr "" -"レイヤー ''{0}''には既にプリミティブ ''{1}''
に競合があります。
" -"最初にこの競合を解決してからやり直してください。" +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." +msgstr "" +"レイヤ ''{0}'' には既に次のオブジェクトの競合があります
''{1}''。" +"
最初に競合を解決してからやり直してください。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -9924,11 +9952,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "{0} プリミティブに空のロールを設定しています。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "これはこれらのプリミティブのロールを削除することと同じです" @@ -10213,6 +10242,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "クリックして選択している範囲をダウンロード" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10224,8 +10253,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." -msgstr "" -" {0} も {1} も有効にできません。
" -"ダウンロードしたOSMデータか、GPXデータか、その両方を閉じてください。" +"
Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10308,4 +10335,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10392,5 +10420,6 @@ msgstr "JOSM ヘルプブラウザ" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10398,17 +10427,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -"

ヘルプ項目の解説文がありません。

ヘルプ項目 {0}の解説文はまだ存在して" -"いません。あなたの母国語 ({1})での解説も、英語の解説もないようです。

" -"不足している情報を追加して、JOSMのヘルプシステムを向上させてください。あなた" -"の母国語({1})でヘルプ項目を編集する こともできますし、 " -"英語のヘルプ項目を書くこともできます。

" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10422,5 +10445,5 @@ "ラーメッセージ (未翻訳):
{1}

" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10431,19 +10454,19 @@ "題と思われるので、
インターネット接続を確認してみてください。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "URLを開けません" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "現在のヘルプページを外部ブラウザで開く" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "現在のヘルプページを編集" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10455,33 +10478,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "現在のヘルプページを再ロード" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "前のページへ" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "次のページへ" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "JOSM ヘルプホームページへ" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "警告: HTML文書に悪いロケーションが指定されています。例外は{0}です。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "ヘルプページのオープンに失敗。ターゲットURLが空です。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "ヘルプページのオープンに失敗" @@ -10596,4 +10619,8 @@ msgid "Relation {0}" msgstr "リレーション {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "オブジェクト" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10720,5 +10747,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "競合が検出されました" @@ -11002,5 +11029,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:30 msgid "List of recently opened files" -msgstr "" +msgstr "最近使用したファイルの一覧" #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:82 @@ -11012,5 +11039,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java:83 msgid "Clear the list of recently opened files" -msgstr "" +msgstr "最近使用したファイルの一覧を消去します" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 @@ -11125,5 +11152,7 @@ "changes.
Layers with non-writable files:" msgstr[0] "" -msgstr[1] "" +"{0} 個のレイヤーを保存する必要がありますが、
対応するファイルに書き" +"込めません。
他のファイルを選択するか、変更を破棄してください。
ファイ" +"ル書き込みできないレイヤー:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:246 @@ -11181,4 +11210,5 @@ "cancelled or have failed." msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:507 @@ -11385,14 +11415,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"警告: プリミティブの ''{0}'' は既にサーバから削除されています。このプリミ" -"ティブをスキップし、アップロードを再試行します。" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク" +"トをスキップしてもう一度アップロードします。" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "プリミティブアップロード準備中" @@ -11539,15 +11571,4 @@ msgstr "変更セットはいっぱいです" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"警告 : オブジェクト ''{0}'' はサーバから既に削除されています。このオブジェク" -"トをスキップしてもう一度アップロードします。" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11558,5 +11579,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11758,4 +11779,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11835,5 +11857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12055,23 +12077,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "データレイヤー {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "バージョン {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12079,11 +12101,11 @@ msgstr[0] "検出された競合が {0} 個あります" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "クリックしてこのダイアログを閉じ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12091,32 +12113,32 @@ msgstr[0] "{0} を削除しました" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0}は以下で構成されています:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "設定解除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "APIバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "データセット一貫性テスト" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "問題はありませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "次の問題が見つかりました:" @@ -12852,6 +12874,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12862,5 +12884,5 @@ #, java-format msgid "loading style ''{0}''..." -msgstr "" +msgstr "スタイル \"{0}\" を読み込み中..." #: ../core/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java:98 @@ -12875,7 +12897,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12890,5 +12912,5 @@ msgstr "不正なマイナス符号。少なくとも1つは正の値にしてください。" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13759,5 +13781,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:45 msgid "Auto save enabled" -msgstr "" +msgstr "自動保存を有効にする" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49 @@ -13781,4 +13803,7 @@ "tries to recover the unsaved changes on next start.)" msgstr "" +"(自動保存機能は変更されたデータレイヤーを一定間隔で保存します。 バックアッ" +"プはJOSMのpreferenceフォルダに保存されます。 クラッシュが起こった場合、JOSMは" +"次の起動時に未保存の変更の回復を試みます。)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:72 @@ -13796,4 +13821,6 @@ "the file name and saves it in the same folder.)" msgstr "" +"(JOSMはデータレイヤーを保存する際にバックアップファイルを保持できます。 " +"ファイル名の最後に''~''を付加して同じフォルダに保存します。)" #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:99 @@ -13857,4 +13884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "なし" @@ -13971,15 +13999,13 @@ msgstr "高速表示（若干汚い）" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "一方通行など、必要なときのみ向きを表示" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "ウェイの開始のみ" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14130,34 +14156,39 @@ msgstr "GPSポイント" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "ウェイのセグメントに方向のヒントを描く。" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "ウェイ内の全セグメントで順序番号を表示する。" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "サーバから読み出したデータの境界を描く。" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "操作対象とするレイヤー以外のレイヤーを別の色で表示します。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14165,5 +14196,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSMデータ" @@ -14199,5 +14230,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:155 msgid "Use offset server: " -msgstr "" +msgstr "オフセットサーバを使う: " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:177 @@ -14219,13 +14250,13 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:200 msgid "Simultaneous connections" -msgstr "" +msgstr "同時接続数" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:216 msgid "Auto zoom by default: " -msgstr "" +msgstr "自動ズームをデフォルト有効にする: " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:220 msgid "Autoload tiles by default: " -msgstr "" +msgstr "自動タイル読み込みをデフォルト有効にする: " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:224 @@ -14243,5 +14274,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:236 msgid "Tile cache directory: " -msgstr "" +msgstr "タイルキャッシュの保存フォルダ: " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:258 @@ -14271,13 +14302,13 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:278 msgid "Offset bookmarks" -msgstr "" +msgstr "オフセットのブックマーク" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:417 msgid "Available default entries:" -msgstr "" +msgstr "利用可能なエントリ:" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:443 msgid "Selected entries:" -msgstr "" +msgstr "選択済みのエントリ:" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:461 @@ -14290,5 +14321,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:462 msgid "add a new wms/tms entry by entering the url" -msgstr "" +msgstr "URLを入力して新しいWMS/TMSエントリを追加する" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:470 @@ -14298,5 +14329,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:482 msgid "remove entry" -msgstr "" +msgstr "エントリを削除する" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:508 @@ -14458,5 +14489,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:111 msgid "Available styles:" -msgstr "" +msgstr "利用可能なスタイル:" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:113 @@ -14466,5 +14497,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:115 msgid "Add a new style by entering filename or URL" -msgstr "" +msgstr "ファイル名かURLを入力して新しいスタイルを追加" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:117 @@ -14837,9 +14868,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:47 msgid "Load data from API" -msgstr "" +msgstr "APIからのデータ読み込み" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:48 msgid "Import data from URL" -msgstr "" +msgstr "指定されたURLからのデータインポート" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:49 @@ -14849,5 +14880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:50 msgid "Create new objects" -msgstr "" +msgstr "新しいオブジェクトの作成" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:51 @@ -14857,9 +14888,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:52 msgid "Change the viewport" -msgstr "" +msgstr "ビューポートの変更" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:53 msgid "Read protocol version" -msgstr "" +msgstr "プロトコルバージョンの読み取り" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54 @@ -14889,5 +14920,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:74 msgid "Permitted actions:" -msgstr "" +msgstr "許可されたアクション:" #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:88 @@ -14897,4 +14928,6 @@ "JOSM." msgstr "" +"JOSMは常にlocalhostの8111番ポートをlistenします。 このポート番号は、外部アプ" +"リケーションがJOSMと連携するために使うので変更できません。" #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:64 @@ -14978,5 +15011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:674 msgid "URL / File:" -msgstr "" +msgstr "URL / ファイル名:" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:688 @@ -14996,5 +15029,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:897 msgid "Reset to default" -msgstr "" +msgstr "デフォルトに戻す" #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1021 @@ -15037,4 +15070,7 @@ "table>" msgstr "" +"タグ付けプリセットのソース {0} を読み込みましたがエラーが含まれていま" +"す。 本当にこれを使いますか？

エラー: [{1}:{2}] {3}" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98 @@ -15076,39 +15112,39 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:211 msgid "Available presets:" -msgstr "" +msgstr "利用可能なプリセット" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:213 msgid "Active presets:" -msgstr "" +msgstr "アクティブなプリセット" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:215 msgid "Add a new preset by entering filename or URL" -msgstr "" +msgstr "ファイル名かURLを入力して新しいプリセットを追加" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:217 msgid "New preset entry:" -msgstr "" +msgstr "新しいプリセットのエントリ:" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:219 msgid "Remove the selected presets from the list of active presets" -msgstr "" +msgstr "選択したプリセットをアクティブなプリセットの一覧から削除" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:221 msgid "Edit the filename or URL for the selected active preset" -msgstr "" +msgstr "選択したアクティブなプリセットのファイル名かURLを編集" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:223 msgid "Add the selected available presets to the list of active presets" -msgstr "" +msgstr "選択した利用可能なプリセットをアクティブなプリセットの一覧に追加" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:225 #, java-format msgid "Reloads the list of available presets from ''{0}''" -msgstr "" +msgstr "利用可能なプリセットの一覧を \"{0}\" から再読み込み" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:227 #, java-format msgid "Loading preset sources from ''{0}''" -msgstr "" +msgstr "プリセットのソースを \"{0}\" から読み込み中" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:229 @@ -15446,4 +15482,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "検証" @@ -16098,7 +16135,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試" @@ -16153,9 +16191,9 @@ msgstr "プリファレンス ''{0}'' がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "このバージョンのJOSMは、設定されたサーバーと互換性がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16166,21 +16204,21 @@ "{1} をサポートしています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "予想外の形式のID がサーバから返されました。入力値: ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16190,69 +16228,69 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "変更セットを作成しています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "変更セット {0} を開きました" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "変更セットID > 0 であるべきです。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "変更セットを更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "変更セット {0} を更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "変更した設定を閉じています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "アップロード要求を準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "10秒待機中 ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "{2} 秒で {1} 分の {0} 回の再試行を開始 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - やり直しています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "{1} 分の {0} 回の再試行を開始。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "現在の変更セットはヌルです。データをアップロードできません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17923,5 +17961,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "不明なオーディオファイル" @@ -19873,5 +19911,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -20125,4 +20163,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20820,5 +20859,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20922,4 +20961,8 @@ msgstr "選択されたウェイのひとつは既に別のマルチポリゴンの一部です。" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21123,22 +21166,22 @@ msgstr "Firefoxの実行ファイル" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "変換エラー: ポイントが近すぎます" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "変換エラー: サポートされない変数" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21773,4 +21816,14 @@ msgid "Waypoints" msgstr "ウェイポイント" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "関連の編集者:{0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22910,4 +22963,60 @@ msgstr "新しい署名キーを選択" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23108,13 +23217,4 @@ "この転回制限はエディタの外部で変更されています。
変更を適用して編集" "を続けることはできません。

競合を作成してエディタを閉じますか？" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." -msgstr "" -"レイヤ ''{0}'' には既に次のオブジェクトの競合があります
''{1}''。" -"
最初に競合を解決してからやり直してください。" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 @@ -24683,6 +24783,11 @@ msgstr "単純にエリアをマルチポリゴンに変換します。" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24695,10 +24800,10 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" @@ -24707,5 +24812,5 @@ #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24713,5 +24818,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24721,10 +24826,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24735,5 +24840,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24744,15 +24849,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24760,20 +24865,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "変更セットを元に戻すプラグイン" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24783,5 +24888,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24793,15 +24898,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "ルーティング能力の提供" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24811,20 +24916,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "openSeaMap用の海図を作成・編集" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "現在のGPS位置上にマーカー/ノードの追加を許可" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "表形式でタグ編集のダイアログ・ボックスを提供" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24837,15 +24942,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "1つのブロックからテラスハウスを作成する" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24854,5 +24959,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24861,10 +24966,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24873,15 +24984,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "OSMデータベースからの削除取消を許可" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24891,5 +25002,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24900,20 +25011,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40339,4 +40450,345 @@ msgstr "テスト" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "簡略化されたストリート名" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "単一ノードに一方通行のタグ" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "単一ノードに橋梁のタグ" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "ノード上の誤った高速道路タグ" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "名前のない一般道(2車線未満)" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "参照のない道路" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "一時的な道路タイプ" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "スペルの間違ったキー名" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "bicycleタグつきの自転車道" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "footタグつきの遊歩道" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "自転車道のレーンとしてウェイを分離する" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "路上のバリア" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "遊歩道に最大速度が指定" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "+ sign付きのlayerタグ" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "ストリート名は ss を含んでいます。" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "typeのないリレーション" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "名前のないレストラン" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "通常無いタグの組み合わせ" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "ランドサット" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "ランドサット(ミラー)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "オープンエアリアルマップ" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo 衛星" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Streets NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "チェコ CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "チェコ UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPEマップ" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPEマップ(Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7番目のシリーズ (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "国土交通省 (オルソ)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "国土交通省 (オルソ01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "国土交通省 (オルソ02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "国土交通省 (オルソ03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italy" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicily - Italy" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - イタリア" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "{0} 個のプリミティブまで" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "{0} 個のプリミティブの削除を取消す" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
''{1}''." +#~ "
Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "レイヤー ''{0}''には既にプリミティブ ''{1}''
に競合があります。" +#~ "
最初にこの競合を解決してからやり直してください。" + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "警告: プリミティブの ''{0}'' は既にサーバから削除されています。このプリミ" +#~ "ティブをスキップし、アップロードを再試行します。" + #~ msgid "Move" #~ msgstr "移動" @@ -41062,7 +41514,4 @@ #~ msgstr "標準" -#~ msgid "Landsat" -#~ msgstr "ランドサット" - #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" @@ -41073,22 +41522,4 @@ #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "oneway tag on a node" -#~ msgstr "単一ノードに一方通行のタグ" - -#~ msgid "bridge tag on a node" -#~ msgstr "単一ノードに橋梁のタグ" - -#~ msgid "highway without a reference" -#~ msgstr "参照のない道路" - -#~ msgid "temporary highway type" -#~ msgstr "一時的な道路タイプ" - -#~ msgid "restaurant without name" -#~ msgstr "名前のないレストラン" - -#~ msgid "unusual tag combination" -#~ msgstr "通常無いタグの組み合わせ" #~ msgid "Motorboat" @@ -41198,7 +41629,4 @@ #~ msgid "Error parsing server response." #~ msgstr "サーバからの応答内容が不正です。" - -#~ msgid "Object" -#~ msgstr "オブジェクト" #~ msgid "" @@ -41350,10 +41778,4 @@ #~ msgid "World" #~ msgstr "世界地図" - -#~ msgid "misspelled key name" -#~ msgstr "スペルの間違ったキー名" - -#~ msgid "barrier used on a way" -#~ msgstr "路上のバリア" #~ msgid "unitarianist" @@ -41477,13 +41899,4 @@ #~ msgstr "ラスター画像の中央: {0}" -#~ msgid "NPE Maps" -#~ msgstr "NPEマップ" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPEマップ(Tim)" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Streets NRW Geofabrik.de" - #~ msgid "Charge" #~ msgstr "料金" @@ -41701,7 +42114,4 @@ #~ msgstr "下に移動" -#~ msgid "Relation Editor: {0}" -#~ msgstr "関連の編集者:{0}" - #~ msgid "Solve Conflict" #~ msgstr "矛盾の解決" @@ -41902,7 +42312,4 @@ #~ msgstr "順不同の道をコピーできません。" -#~ msgid "street name contains ss" -#~ msgstr "ストリート名は ss を含んでいます。" - #~ msgid "Directly load TCX files from JOSM." #~ msgstr "直接JOSMからのTCXファイルをロードしてください。" @@ -41913,7 +42320,4 @@ #~ msgid "Auto-tag source added:" #~ msgstr "自動タグのソースを追加しました。:" - -#~ msgid "abbreviated street name" -#~ msgstr "簡略化されたストリート名" #~ msgid "" @@ -42023,7 +42427,4 @@ #~ msgstr "" #~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "ノード上の誤った高速道路タグ" #~ msgid "Join Areas: Remove Short Ways" @@ -42105,18 +42506,6 @@ #~ msgstr "米Yahoo (WebKit GTK)" -#~ msgid "Open Aerial Map" -#~ msgstr "オープンエアリアルマップ" - #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "米Yahoo (GNOME Fix)" - -#~ msgid "layer tag with + sign" -#~ msgstr "+ sign付きのlayerタグ" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "自転車道のレーンとしてウェイを分離する" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "bicycleタグつきの自転車道" #~ msgid "GPS unit timezone (difference to photo)" @@ -42195,7 +42584,4 @@ #~ msgstr "間違った数のパラメータが、ノード演算子に渡されました。" -#~ msgid "relation without type" -#~ msgstr "typeのないリレーション" - #~ msgid "The projection could not be read from preferences. Using Mercator" #~ msgstr "投影法が設定から読み取れません。メルカトル図法を使います。" @@ -43332,19 +43718,4 @@ #~ msgstr "UTM ゾーン {0}" -#~ msgid "Czech CUZK:KM" -#~ msgstr "チェコ CUZK:KM" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo 衛星" - #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" @@ -43352,7 +43723,4 @@ #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "チェコ UHUL:ORTOFOTO" #~ msgid "Illegal value for attribute ''uid''. Got ''{0}''" @@ -44067,13 +44435,4 @@ #~ "html>" -#~ msgid "Unnamed unclassified highway" -#~ msgstr "名前のない一般道(2車線未満)" - -#~ msgid "footway with tag foot" -#~ msgstr "footタグつきの遊歩道" - -#~ msgid "maxspeed used for footway" -#~ msgstr "遊歩道に最大速度が指定" - #~ msgid "Footway" #~ msgstr "遊歩道" @@ -44257,16 +44616,4 @@ #~ "マルチポリゴンはクローズドウェイだけから構成されていなければなりません" -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "国土交通省 (オルソ)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "国土交通省 (オルソ01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "国土交通省 (オルソ02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "国土交通省 (オルソ03)" - #~ msgid "Please enter a latitude in the range -90..90" #~ msgstr "-90から90の範囲で緯度を入力してください" @@ -44303,7 +44650,4 @@ #~ "''{0}''" -#~ msgid "7th Series (OS7)" -#~ msgstr "7番目のシリーズ (OS7)" - #~ msgid "Missing right parent" #~ msgstr "正しい親が見つかりません" @@ -44394,4 +44738,7 @@ #~ "last one." #~ msgstr "これより短いウェイでは方向の矢印を描画しない。" + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "一方通行など、必要なときのみ向きを表示" #~ msgid "" @@ -44633,4 +44980,11 @@ #~ msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。" +#~ msgid "" +#~ "The child relation
{0}
is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "子リレーション
{0}
はサーバ上から削除されました。ロードできま" +#~ "せん" + #~ msgid "Cannot open directory.
Please select a file!" #~ msgstr "" @@ -44704,4 +45058,29 @@ #~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ " {0} も {1} も有効にできません。" +#~ "
ダウンロードしたOSMデータか、GPXデータか、その両方を閉じてください。" + +#~ msgid "" +#~ "

Help content for help topic missing

Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

" +#~ msgstr "" +#~ "

ヘルプ項目の解説文がありません。

ヘルプ項目 {0}の解説文はまだ存在し" +#~ "ていません。あなたの母国語 ({1})での解説も、英語の解説もないようです。" +#~ "

不足している情報を追加して、JOSMのヘルプシステムを向上させてくださ" +#~ "い。あなたの母国語({1})でヘルプ項目を編集する こともで" +#~ "きますし、 英語のヘルプ項目を書くこともできます。" + +#~ msgid "" #~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}" #~ msgstr "" @@ -44723,10 +45102,4 @@ #~ msgid "UTM20 North Geodesic system" #~ msgstr "UTM２０北測地システム" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italy" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicily - Italy" #~ msgid "Splits the way" @@ -44759,4 +45132,7 @@ #~ "解決してください。" +#~ msgid "Click do download the currently selected area" +#~ msgstr "クリックして選択している範囲をダウンロード" + #~ msgid "Set width of building" #~ msgstr "ビルの幅をセット" @@ -44887,10 +45263,4 @@ #~ msgstr "戻る" -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - イタリア" - -#~ msgid "Landsat (mirror)" -#~ msgstr "ランドサット(ミラー)" - #~ msgid "Internal style" #~ msgstr "内部スタイル" @@ -44916,4 +45286,7 @@ #~ msgid "Add WMS URL" #~ msgstr "WMS URLの追加" + +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Wikiのヘルプをブラウザで開いてオブジェクトを選択" #~ msgid "replaced by {0} plugin" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 25650) +++ /applications/editors/josm/i18n/po/nb.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2010-12-03 21:21+0000\n" "Last-Translator: Stian Ellingsen \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:26+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:19+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Hjelp" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Overser feilutformet fil-URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" støtter ikke filnavn eller fil baner" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Overser feilutformet URL: «{0}»" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -125,13 +125,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/Main.java:759 +msgid "Exit JOSM" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/Main.java:760 +msgid "Continue, try anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/Main.java:761 -msgid "Exit JOSM" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:762 -msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -152,4 +152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -191,18 +192,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -221,4 +222,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Om" @@ -305,9 +308,11 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" -msgstr "" +"page for OSM object will probably fail. API base URL is: ''{0}''" +msgstr "" +"Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " +"riktig til historikkside for OSM-element. API-URL er «{0}»." #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 @@ -406,4 +411,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -488,5 +494,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -575,6 +581,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -617,51 +623,51 @@ msgstr "Velg minst 3 noder" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "lag" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "utvalg" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "last ned" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "forrige" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "neste" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Inet utvalg å vise." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Gå til {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Skaler og flytt skjermbildet til {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -671,5 +677,5 @@ msgstr "Bilde: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Ingen konflikter å vise." @@ -971,9 +977,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "unset: ikke sett egenskap på valgte objekter" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -982,5 +989,5 @@ msgstr "Fordoble" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Fordoble utvalget ved å kopiere og umiddelbart lime inn." @@ -1088,5 +1095,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1441,6 +1448,7 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" -msgstr "" +#, fuzzy +msgid "Merge the currently selected objects into another layer" +msgstr "Flett det gjeldende laget inn i et annet lag" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1703,7 +1711,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1726,9 +1734,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "La til {0} objekt" +msgstr[1] "La til {0} objekter" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1841,4 +1849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2757,5 +2766,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2763,4 +2772,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3364,5 +3374,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3377,5 +3387,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3587,9 +3597,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "La til {0} objekt" +msgstr[1] "La til {0} objekter" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3887,5 +3897,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3943,8 +3953,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4098,5 +4109,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "bakgrunn" @@ -4797,5 +4808,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4809,4 +4820,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5304,6 +5316,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5421,5 +5433,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5664,5 +5676,5 @@ msgstr "Innstilligen {0} er fjernet fordi den ikke lenger brukes." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5670,10 +5682,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Vis" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5681,5 +5693,5 @@ msgstr "Verktøy" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5687,5 +5699,5 @@ msgstr "Objektmaler" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5696,5 +5708,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Audio" @@ -6087,10 +6099,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +msgid "Merging deleted objects failed" msgstr "" @@ -6369,8 +6381,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(ingen)" @@ -6410,5 +6424,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Objekt" @@ -6642,6 +6655,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6652,5 +6665,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6835,5 +6848,4 @@ msgstr "Åpne liste over alle kommandoer(angre-buffer)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6844,5 +6856,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6850,7 +6862,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6881,13 +6894,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Åpne en dialog for å sammenføye element i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7460,11 +7473,11 @@ msgstr "Klikk for at minimere/maksimere panelet" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Opphavsmenn" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Åbn en liste af brugere som jobber på de valgte objekt." @@ -7478,5 +7491,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7544,4 +7557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Korriger" @@ -7763,6 +7777,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "unset: ikke sett egenskap på valgte objekter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7798,6 +7813,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "Fant ikke noe objekt med ID {0} i dette datasettet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 @@ -8930,5 +8946,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9400,5 +9416,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9452,5 +9468,5 @@ msgid "" "The child relation
{0}
is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9540,10 +9556,10 @@ msgid "" "This relation already has one or more members referring to
the " -"primitive ''{0}''

Do you really want to add another relation member?
Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9557,16 +9573,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +msgid "Add all objects selected in the current dataset before the first member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +msgid "Add all objects selected in the current dataset after the last member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9574,11 +9588,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 msgid "" -"Add all primitives selected in the current dataset after the last selected " +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Åbn en liste af brugere som jobber på de valgte objekt." #. putValue(NAME, tr("Remove Selected")); @@ -9589,6 +9604,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9596,11 +9610,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Slet valgt relasjon" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9692,8 +9706,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''." -"
Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " +"resolve this conflict first, then try again." msgstr "" @@ -9745,11 +9760,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -10028,5 +10043,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -10039,5 +10054,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
Please chose to either download OSM data, or GPX data, or both." +"
Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10121,4 +10136,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10203,5 +10219,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10209,11 +10226,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

Please help to improve the JOSM help system and fill in the " +"English.

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

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10224,5 +10241,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10231,19 +10248,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10253,33 +10270,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10395,4 +10412,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10512,5 +10533,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Konflikter avdekkeet" @@ -11147,13 +11168,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Klargjør data …" #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11284,13 +11307,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11299,5 +11313,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11490,4 +11504,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11569,5 +11584,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11785,23 +11800,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "utenfor nedlastet område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "versjon {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11810,11 +11825,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11823,32 +11838,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "ikke satt" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12578,6 +12593,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12601,7 +12616,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12616,5 +12631,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13523,4 +13538,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Ingen" @@ -13637,15 +13653,13 @@ msgstr "Hurtig opptegning (ser uryddig ut)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Bare ved enden av linja." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13800,34 +13814,39 @@ msgstr "GPS-punkter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Tegn retningspiler på linjestykker." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Tegn nummer for linjesegmenter i hver linje." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Tegn omrisset av data hentet fra tjeneren." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Tegn inaktive datalag i en annen farge." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13835,5 +13854,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM-data" @@ -15081,4 +15100,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Valider" @@ -15710,7 +15730,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Tjeneren svarte med HTTP 404, prøver igjen med en forespørsel for hvert " @@ -15766,9 +15787,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Denne versjonen av JOSM kan ikke lese fra tjeneren." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15777,21 +15798,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Uventet ID-format i svar fra tjener – leste «{0}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15799,69 +15820,69 @@ msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Lukker endringssett …" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Ingen base med rettinger tilstede for opplasting" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17414,5 +17435,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19337,5 +19358,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19587,4 +19608,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20285,5 +20307,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20387,4 +20409,8 @@ msgstr "En av de valgte linjene er allerede del av en annen multipolygon." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20585,22 +20611,22 @@ msgstr "Firefox-programfil" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21234,4 +21260,14 @@ msgid "Waypoints" msgstr "Veipunkt" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relasjons-editor: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22373,4 +22409,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22560,11 +22652,4 @@ "cannot apply your changes and continue editing.

Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
''{1}''.
Please " -"resolve this conflict first, then try again." msgstr "" @@ -24120,6 +24205,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24132,15 +24222,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importerer tema fra OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24148,5 +24238,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24154,10 +24244,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24166,5 +24256,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24175,15 +24265,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24191,20 +24281,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24214,5 +24304,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24223,15 +24313,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Gir deg Ruteplanlegger på OSM data." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24241,20 +24331,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24267,15 +24357,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Lager rekkehus / terassehus fra en enkel husblokk." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24284,5 +24374,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24291,10 +24381,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24303,15 +24399,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24321,5 +24417,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24328,20 +24424,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier." #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39763,4 +39859,323 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "forkortet gatenavn" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "enveiskjøring-egenskap på node" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "Node har egenskap bro" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "feil ferdselsvei-egenskap på node" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Uklassifisert ferdselsvei uten navn" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "ferdselsvei uten veinummer" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "midlertidig ferdselsveitype" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "feilstavet nøkkelnavn" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "sykkelvei med egenskapen sykkel" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "gangvei med egenskapen fotgjenger" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "separat sykkelvei som kjørefelt på en sykkelvei" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "hinder brukt på en vei" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "fartsgrense er brukt på gangvei" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "navn på lag inneholder +-tegn" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "gatenavn inneholder ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relasjon uten angitt type" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurant uten navn" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "uvanlig kombinasjon av egenskaper" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Gater NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Tsjekkisk CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Tsjekkisk UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE-kart" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE-kart (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi, Italia" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicilia, Italia" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Move" #~ msgstr "Flytt" @@ -39886,18 +40301,6 @@ #~ msgstr "Oberpfalz Geofabrik.de" -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Gater NRW Geofabrik.de" - #~ msgid "YAHOO (GNOME)" #~ msgstr "Yahoo (GNOME)" - -#~ msgid "unusual tag combination" -#~ msgstr "uvanlig kombinasjon av egenskaper" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - -#~ msgid "restaurant without name" -#~ msgstr "restaurant uten navn" #~ msgid "Dupe {0} nodes into {1} nodes" @@ -40093,7 +40496,4 @@ #~ msgstr "Løs Konflikter" -#~ msgid "Object" -#~ msgstr "Objekt" - #~ msgid "Click Reload to refresh list" #~ msgstr "Oppfrisk liste - Klikk Reload" @@ -40178,7 +40578,4 @@ #~ msgstr "Flytt ned" -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relasjons-editor: {0}" - #~ msgid "Remove the member in the current table row from this relation" #~ msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen" @@ -40297,4 +40694,7 @@ #~ msgid "Create non-audio markers when reading GPX." #~ msgstr "Opprett markører uten lyd når GPX-data leses." + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)" #~ msgid "" @@ -41240,10 +41640,4 @@ #~ msgstr "Dupliser linjer med parallell avstand" -#~ msgid "cycleway with tag bicycle" -#~ msgstr "sykkelvei med egenskapen sykkel" - -#~ msgid "barrier used on a way" -#~ msgstr "hinder brukt på en vei" - #~ msgid "Shop" #~ msgstr "Butikk" @@ -41303,18 +41697,6 @@ #~ msgstr "standard" -#~ msgid "bridge tag on a node" -#~ msgstr "Node har egenskap bro" - -#~ msgid "abbreviated street name" -#~ msgstr "forkortet gatenavn" - -#~ msgid "relation without type" -#~ msgstr "relasjon uten angitt type" - #~ msgid "Waterway Point" #~ msgstr "Punkt i vann" - -#~ msgid "maxspeed used for footway" -#~ msgstr "fartsgrense er brukt på gangvei" #~ msgid "The projection could not be read from preferences. Using Mercator" @@ -41625,13 +42007,4 @@ #~ msgstr "Rediger traktorvei klasse 4" -#~ msgid "oneway tag on a node" -#~ msgstr "enveiskjøring-egenskap på node" - -#~ msgid "highway without a reference" -#~ msgstr "ferdselsvei uten veinummer" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "feil ferdselsvei-egenskap på node" - #~ msgid "There are no selected primitives to update." #~ msgstr "Det er ingen valgte objekter å oppdatere" @@ -41808,7 +42181,4 @@ #~ msgstr "Sett opp nettsteder …" -#~ msgid "Preparing data..." -#~ msgstr "Klargjør data …" - #~ msgid "Preparing..." #~ msgstr "Forbereder …" @@ -41971,16 +42341,4 @@ #~ msgstr "Fasiliteter" -#~ msgid "street name contains ss" -#~ msgstr "gatenavn inneholder ss" - -#~ msgid "layer tag with + sign" -#~ msgstr "navn på lag inneholder +-tegn" - -#~ msgid "NPE Maps" -#~ msgstr "NPE-kart" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE-kart (Tim)" - #~ msgid "YAHOO (WebKit)" #~ msgstr "Yahoo (WebKit)" @@ -41988,7 +42346,4 @@ #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "Yahoo (GNOME-fiks)" - -#~ msgid "Landsat" -#~ msgstr "Landsat" #~ msgid "YAHOO (WebKit GTK)" @@ -42414,11 +42769,4 @@ #~ msgid "Unfreeze the list of merged elements and start merging" #~ msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing" - -#~ msgid "" -#~ "WARNING: unexpected format of API base URL. Redirection to history page " -#~ "for OSM primitive will probably fail. API base URL is: ''{0}''" -#~ msgstr "" -#~ "Advarsel: Uventet format for API-URL. Vil sannsynligvis ikke omdirigere " -#~ "riktig til historikkside for OSM-element. API-URL er «{0}»." #~ msgid "Freeze the current list of merged elements" @@ -42653,13 +43001,4 @@ #~ msgstr "Kryss uten navn" -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - #~ msgid "No data" #~ msgstr "Ingen data" @@ -42673,7 +43012,4 @@ #~ msgid "Conflicts in data" #~ msgstr "Konflikter i data" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" #~ msgid "Uploading failed.
{0}" @@ -42880,10 +43216,4 @@ #~ msgstr "Multipolygon må bestå kun av lukkede linjer." -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Uklassifisert ferdselsvei uten navn" - -#~ msgid "temporary highway type" -#~ msgstr "midlertidig ferdselsveitype" - #~ msgid "Travel" #~ msgstr "Reise" @@ -42891,23 +43221,2 @@ #~ msgid "Man-Made" #~ msgstr "Menneskeskapt" - -#~ msgid "misspelled key name" -#~ msgstr "feilstavet nøkkelnavn" - -#~ msgid "footway with tag foot" -#~ msgstr "gangvei med egenskapen fotgjenger" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "separat sykkelvei som kjørefelt på en sykkelvei" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Tsjekkisk UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Tsjekkisk CUZK:KM" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi, Italia" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicilia, Italia" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 25650) +++ /applications/editors/josm/i18n/po/nl.po (revision 25651) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-06 12:36+0000\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-11 14:59+0000\n" "Last-Translator: Polyglot \n" "Language-Team: Dutch \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:18+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:16+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Help" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ongeldige bestands-URL negeren: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,15 +108,15 @@ msgstr "Waarschuwing" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Parameter \"downloadgps\" accepteert geen bestandsnamen of bestands-URLs" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" -msgstr "Ongeldige URL negeren: \"{0}\"" - -#: ../core/src/org/openstreetmap/josm/Main.java:746 +msgstr "Ongeldige URL \"{0}\" wordt genegeerd" + +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -127,15 +127,15 @@ "

JOSM maakt gebruik van Java versie 6.

Gedetecteerde Java versie: {0}." "
U kan
  • uw Java (JRE) bijwerken of
  • een oudere (Java 5 " -"compatible) versie van JOSM gebruiken.
" - -#: ../core/src/org/openstreetmap/josm/Main.java:761 +"compatibele) versie van JOSM gebruiken.Meer informatie:" + +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "JOSM verlaten" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/Main.java:763 +msgstr "Toch proberen door te gaan" + +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -156,4 +156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -195,18 +196,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -225,4 +226,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Over" @@ -260,5 +263,5 @@ #, java-format msgid "Java Version {0}" -msgstr "Java-versie {0}" +msgstr "Java versie {0}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70 @@ -280,5 +283,5 @@ #: build/trans_surveyor.java:64 msgid "Info" -msgstr "Informatie" +msgstr "Info" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79 @@ -288,5 +291,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80 msgid "Revision" -msgstr "Revisie" +msgstr "Herziening" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81 @@ -309,12 +312,12 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" -msgstr "" -"WAARSCHUWING: onverwacht formaat van de API basis-URL. Doorklikken naar " -"informatie of geschiedenispagina voor OSM-primitieven zal waarschijnlijk " -"mislukken. API basis-URL staat ingesteld op: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" +msgstr "" +"WAARSCHUWING: de API basis-URL heeft een ongeldig formaat. Doorklikken naar " +"een informatie- of geschiedenispagina met info over OSM-primitieven zal " +"waarschijnlijk mislukken. De API-basis-URL staat ingesteld op: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 @@ -324,7 +327,7 @@ "user will probably fail. API base URL is: ''{0}''" msgstr "" -"WAARSCHUWING: onverwachte formaat van de API basis URL. Verwijzing naar de " -"gebruikers pagina voor OSM zal waarschijnlijk mislukken. API basis URL is: " -"''{0}''" +"WAARSCHUWING: de API basis-URL heeft een ongeldig formaat. Doorklikken naar " +"de gebruikerspagina van een OSM-gebruiker zal waarschijnlijk mislukken. De " +"API-basis-URL staat ingesteld op: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86 @@ -334,6 +337,6 @@ "screen with browser windows
and take some time to finish." msgstr "" -"U staat op het punt {0} browser vensters te openen.
Dit kan zowel uw " -"scherm met browser vensters vullen
als een behoorlijke tijd duren." +"U staat op het punt {0} browservensters te openen.
Dit zal uw scherm " +"opvullen met browservensters
en het zal ook een behoorlijke tijd duren." #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92 @@ -346,5 +349,5 @@ #, java-format msgid "Click to continue and to open {0} browsers" -msgstr "Klik om door te gaan en om {0} browsers te openen" +msgstr "Klik om door te gaan en om {0} browservensters te openen" #. Strings in JFileChooser @@ -416,4 +419,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -437,14 +441,14 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100 msgid "Click to abort launching external browsers" -msgstr "Klik hier om het openen van de externe browsers te annuleren" +msgstr "Klik hier om het openen van de externe browservensters te annuleren" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -"Selecteer minstens één reeds opgeladen knooppunt, weg of relatie a.u.b." +"Gelieve minstens één reeds opgeladen knooppunt, weg of relatie te selecteren." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:62 msgid "Please select the target layer." -msgstr "Selecteer de doellaag AUB" +msgstr "Gelieve de doellaag te selecteren." #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:66 @@ -499,5 +503,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -582,10 +586,10 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139 msgid "Please select at least four nodes." -msgstr "Selecteer minstens vier knopen." +msgstr "Gelieve minstens vier knopen te selecteren." #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -621,58 +625,58 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 msgid "Move the selected nodes in to a line." -msgstr "De geselecteerde knopen op een lijn plaatsen" +msgstr "De geselecteerde knopen op een rechte lijn plaatsen" #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65 msgid "Please select at least three nodes." -msgstr "Selecteer minstens drie knopen:" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +msgstr "Gelieve minstens drie knopen te selecteren:" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "gegevens" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" -msgstr "Laag" - -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +msgstr "laag" + +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "selectie" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflict" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "download" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "vorige" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "volgende" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Geen selectie om op in te zoomen." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Inzoomen op {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Beeld inzoomen op {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -682,5 +686,5 @@ msgstr "Beeld: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Geen conflicten om op in te zoomen" @@ -688,11 +692,10 @@ #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32 msgid "Changeset Manager" -msgstr "Wijzigingensets Bewerken" +msgstr "Wijzigingensetsbewerkvenster" #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37 msgid "Toggle visibility of Changeset Manager window" -msgstr "" -"Zichtbaarheid van de Wijzigingensets Bewerkingsvenster aan of uitzetten" +msgstr "Zichtbaarheid van het Wijzigingensetsbewerkvenster aan- of uitzetten" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 @@ -704,5 +707,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 msgid "Closes open changesets" -msgstr "Dit Sluit geopende wijzigingensets" +msgstr "Dit sluit openstaande wijzigingensets af" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39 @@ -726,5 +729,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81 msgid "There are no open changesets" -msgstr "Er zijn geen geopende wijzigingensets" +msgstr "Er zijn geen openstaande wijzigingensets" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 @@ -768,6 +771,6 @@ "nodes)" msgstr "" -"Kan geen wegen combineren (ze kunnen niet worden samengevoegd tot een enkele " -"reeks van knopen)" +"Deze wegen kunnen niet gecombineerd worden (Ze kunnen niet worden " +"samengevoegd tot een opeenvolgende reeks van knooppunten)" #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:239 @@ -804,9 +807,9 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 msgid "Create a circle from three selected nodes." -msgstr "Een cirkel uit drie knopen maken." +msgstr "Een cirkel aanmaken op basis van drie geselecteerde knooppunten." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204 msgid "Those nodes are not in a circle. Aborting." -msgstr "Deze nodes staan niet in een circel. Opheffend" +msgstr "Deze knooppunten staan niet in een circel. Actie wordt geannuleerd." #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265 @@ -824,9 +827,9 @@ #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118 msgid "Create multipolygon" -msgstr "Multipolygon aanmaken" +msgstr "Multipolygoon aanmaken" #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:49 msgid "Create multipolygon." -msgstr "Multipolygon aanmaken." +msgstr "Multipolygoon aanmaken." #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:60 @@ -943,9 +946,9 @@ #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:83 msgid "Object type:" -msgstr "Object-type:" +msgstr "Objecttype:" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:58 msgid "Choose the OSM object type" -msgstr "Kies het type OSM-object" +msgstr "Kies het type van het OSM-object" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63 @@ -986,11 +989,12 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "" "Download primitieven met verwijzingen naar een van de geselecteerde " "primitieven" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -999,15 +1003,17 @@ msgstr "Dupliceren" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." -msgstr "Dupliceer selectie door kopiëren en direct plakken." +msgstr "" +"Dupliceer selectie door kopiëren en direct plakken waar muisaanwijzer zich " +"bevindt." #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20 msgid "Duplicate Layer" -msgstr "Laag verdubbelen" +msgstr "Laag dupliceren" #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20 msgid "Make a duplicate of the currently selected layer." -msgstr "Dupliceer de huidige geselecteerde laag" +msgstr "Dupliceer de momenteel geselecteerde laag" #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 @@ -1050,9 +1056,9 @@ #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:37 msgid "Toggle fullscreen view" -msgstr "Omschakelen tussen volledig scherm/venster" +msgstr "Omschakelen tussen volledig schermmodus/venstermodus" #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:38 msgid "Toggle Fullscreen view" -msgstr "Omschakelen tussen volledig scherm/venster" +msgstr "Omschakelen tussen volledig schermmodus/venstermodus" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 @@ -1082,18 +1088,18 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "Toon geschiedenis van OSM wegen, knopen of relaties." +msgstr "Toon geschiedenis van wegen, knopen of relaties in OSM." #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:46 msgid "New offset" -msgstr "Nieuwe verschuiving achtergrondlaag" +msgstr "Nieuwe verschuiving achtergrondafbeelding" #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:47 msgid "Adjust the position of this imagery layer" -msgstr "Positie van deze achtergrondlaag aanpassen" +msgstr "De positie van deze achtergrondafbeelding aanpassen" #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:156 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:31 msgid "Adjust imagery offset" -msgstr "Verschuiving van deze achtergrondlaag aanpassen" +msgstr "Verschuiving van deze achtergrondafbeelding aanpassen" #. Strings in JFileChooser @@ -1105,5 +1111,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1140,5 +1146,6 @@ "If you want to save the offset as bookmark, enter the bookmark name below" msgstr "" -"Maak gebruik van de pijltjestoetsen om de achtergrondlaag te verplaatsen.\n" +"Maak gebruik van de pijltjestoetsen om de achtergrondafbeelding te " +"verplaatsen.\n" "Het is ook mogelijk om de oostelijke en noordelijke verschuiving in de {0}-" "coördinaten op te geven.\n" @@ -1154,5 +1161,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:781 msgid "Northing" -msgstr "Verschuiving in oostelijke richting" +msgstr "Verschuiving in noordelijke richting" #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:169 @@ -1162,5 +1169,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:219 msgid "Offset bookmark already exists. Overwrite?" -msgstr "Deze bladwijzer bestaat al. Overschrijven?" +msgstr "Er bestaat al een bladwijzer met deze naam. Deze overschrijven?" #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 @@ -1171,5 +1178,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "Toon objectinformatie over OSM wegen, knopen of relaties." +msgstr "Toon objectinformatie over wegen, knopen of relaties in OSM." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 @@ -1179,5 +1186,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 msgid "Joins areas that overlap each other" -msgstr "Overlappende gebieden samenvoegen" +msgstr "Voegt overlappende gebieden samen" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:320 @@ -1188,6 +1195,6 @@ msgid "One of the selected ways is not closed and therefore cannot be joined." msgstr "" -"Eén van de geselecteerde wegen is niet gesloten en kan bijgevolg niet worden " -"gebruikt om samen te voegen met andere." +"Eén van de geselecteerde wegen vormt geen gesloten veelhoek en kan bijgevolg " +"niet worden gebruikt om samen te voegen met de andere." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340 @@ -1212,10 +1219,10 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344 msgid "Are you really sure to continue?" -msgstr "Weet u echt zeker dat u door wil gaan?" +msgstr "Weet u echt zeker dat u door wilt gaan?" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:710 msgid "Please abort if you are not sure" -msgstr "Breek af als je het niet zeker weet" +msgstr "Gelieve af te breken als u niet zeker bent" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:362 @@ -1253,5 +1260,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519 msgid "Joined overlapping areas" -msgstr "Zichzelf overlappend gebied samengevoegd" +msgstr "Overlappende gebieden werden samengevoegd" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:522 @@ -1269,5 +1276,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855 msgid "Split ways into fragments" -msgstr "Splits wegen op in fragmenten" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1241 @@ -1302,5 +1309,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370 msgid "Removed Element from Relations" -msgstr "elementen verwijderd van relaties" +msgstr "Element werd verwijderd uit relaties" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1438 @@ -1315,5 +1322,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31 msgid "Join Node to Way" -msgstr "Knoop aan weg knopen" +msgstr "Knooppunt aan weg vastknopen" #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 @@ -1488,6 +1495,7 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" -msgstr "Voeg de huidig geselecteerd primitieven toe in een andere laag" +#, fuzzy +msgid "Merge the currently selected objects into another layer" +msgstr "Voeg de momenteel geselecteerde primitieven toe in een andere laag" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1561,5 +1569,5 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 msgid "Create a new map layer." -msgstr "Een nieuwe kaart laag aanmaken" +msgstr "Een nieuwe kaartlaag aanmaken" #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:50 @@ -1580,8 +1588,6 @@ msgid "Cannot open {0} file with the file importer ''{1}''." msgid_plural "Cannot open {0} files with the file importer ''{1}''." -msgstr[0] "" -"Kan {0} bestand met de bestand import toepassing niet openen ''{1}''." -msgstr[1] "" -"Kan {0} bestanden met de bestand import toepassing niet openen ''{1}''." +msgstr[0] "Kan {0}-bestand niet openen met bestandimporttoepassing ''{1}''." +msgstr[1] "Kan {0}-bestanden niet openen met bestandimporttoepassing ''{1}''." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:156 @@ -1591,9 +1597,9 @@ "Cannot open {0} files because no suitable file importer is available." msgstr[0] "" -"Kan {0} bestand niet openen wegens een ontbrekende geschikte bestand import " -"toepassing." +"Kan {0}-bestand niet openen wegens een er geen geschikte " +"bestandimporttoepassing voorhanden is." msgstr[1] "" -"Kan {0} bestanden niet openen wegens een ontbrekende geschikte bestand " -"import toepassing." +"Kan {0}-bestanden niet openen wegens een er geen geschikte " +"bestandimporttoepassing voorhanden is." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:209 @@ -1601,5 +1607,6 @@ msgid "Cannot open directory ''{0}''.
Please select a file." msgstr "" -"Kan map ''{0}' niet openen'.
Graag een bestand selecteren." +"Kan map ''{0}' niet openen'.
Gelieve een bestand te selecteren." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210 @@ -1664,10 +1671,11 @@ "shortcut for Orthogonalize / Undo. The default is Shift-Q.)" msgstr "" -"

Als een of meer van de wegen geselecteerd zijn, is de form aangepast " -"zodat alle hoeken 90 of 180 graden zijn.

Je mag twee knopen aan de " -"selectie toevoegen. De richting is door deze twee knopen vastgesteld. " -"(Daarna, is het altijd mogelijk bewegingen van bepaalde knopen ongedaan te " -"maken:
Selecteer deze knopen en druk de korte kies toets voor Orthogonaal " -"Trekken / Ongedaan Maken. Default is dit Shift+Q." +"

Als een of meer van de wegen geselecteerd zijn, wordt de vorm zodanig " +"aangepast dat alle hoeken 90 of 180 graden zijn.

Er kunnen twee " +"referentieknooppunten aan de selectie worden toegevoegd. In dat geval wordt " +"de richting door deze twee knooppunten bepaald. (Daarna, is het altijd " +"mogelijk bewegingen voor bepaalde knooppunten ongedaan te maken:" +"
Selecteer deze knopen en druk op de sneltoetscombinatie voor Orthogonaal " +"Trekken / Ongedaan Maken. Standaard is dit Shift+Q." #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45 @@ -1679,5 +1687,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47 msgid "Move nodes so all angles are 90 or 180 degrees" -msgstr "Verplaats de knopen zo dat alle hoeken 90 of 180 graden worden" +msgstr "Verplaats knooppunten zodat alle hoeken 90 of 180 graden worden" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78 @@ -1688,5 +1696,6 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80 msgid "Undo orthogonalization for certain nodes" -msgstr "Loodrecht maken van bepaalde knopen ongedaan maken" +msgstr "" +"Loodrecht maken van bepaalde knopen ongedaan maken voor bepaalde knooppunten" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:101 @@ -1699,5 +1708,8 @@ "Please select nodes that were moved by the previous Orthogonalize Shape " "action!" -msgstr "Vorm Orthogonaal Trekken / Ongedaan maken" +msgstr "" +"Vorm Orthogonaal Trekken / Ongedaan maken\n" +"Gelieve knooppunten te selecteren die tijdens de vorige Orthogonaal trekken-" +"actie onterecht verplaatst werden" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 @@ -1711,7 +1723,8 @@ "projection to get rid of this warning.
Do you want to continue?" msgstr "" -"Het EPSG:4326 projectie wordt gebruikt.
Dit kan leiden tot " -"onverwachte resultaten bij rechthoekige uitlijnen.
Verander de projectie " -"type om deze waarschuwing te sussen.
Wilt u doorgaan?" +"U maakt gebruik van de EPSG:4326-projectie.
Dit kan leiden tot " +"onverwachte resultaten bij rechthoekig uitlijnen.
Verander het " +"projectietype om deze waarschuwing te onderdrukken.
Wilt u doorgaan?" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148 @@ -1760,15 +1773,16 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153 msgid "Delete incomplete members?" -msgstr "Verwijder oncomplete delen?" +msgstr "Verwijder onvolledige leden?" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154 msgid "Paste without incomplete members" -msgstr "Plakken zonder oncomplete delen" +msgstr "Plakken zonder onvolledige leden?" #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "De gekopieerde data bevat onvolledige primitieven. Bij het plakken hiervan " @@ -1794,9 +1808,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "aan {0} primitief" -msgstr[1] "aan {0} primitieven" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Verwijder {0} object" +msgstr[1] "Verwijder {0} objecten" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1861,5 +1875,5 @@ msgstr "" "Een aantal van de geselecteerde objecten werd in deze sessie gewijzigd." -"
Selecteerd doorgaan als deze eveneens mogen verwijderd worden." +"
Selecteer doorgaan als deze eveneens mogen verwijderd worden." #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:280 @@ -1871,5 +1885,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:379 msgid "Redo" -msgstr "Opnieuw doen" +msgstr "Opnieuw uitvoeren" #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24 @@ -1917,4 +1931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2024,5 +2039,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Copy to clipboard and close" -msgstr "Klembord kopiëren en sluiten" +msgstr "Naar klembord kopiëren en afsluiten" #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 @@ -2035,5 +2050,5 @@ #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1379 msgid "Close" -msgstr "Sluiten" +msgstr "Afsluiten" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39 @@ -2043,5 +2058,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39 msgid "Delete unnecessary nodes from a way." -msgstr "Ongebruikte knopen van een weg verwijderen." +msgstr "Overbodige knopen uit een weg verwijderen." #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:66 @@ -2135,5 +2150,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80 msgid "Split a way at the selected node." -msgstr "Een weg bij de geselecteerde knoop splitsen." +msgstr "Een weg bij het geselecteerde knooppunt splitsen." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103 @@ -2141,6 +2156,6 @@ "The current selection cannot be used for splitting - no node is selected." msgstr "" -"De huidige selektie kan niet worden gebruikt voor splitsing - er is geen " -"knooppunt geselekteerd." +"De huidige selectie kan niet worden gebruikt voor splitsing - er is geen " +"knooppunt geselecteerd." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109 @@ -2165,9 +2180,9 @@ "way also." msgstr[0] "" -"Er is meer dan een weg die gebruikt maakt van het knooppunt die u " -"geselecteerd heeft, Selecteer ook de weg." +"Er is meer dan één weg die gebruikt maakt van het knooppunt die u " +"geselecteerd heeft. Selecteer ook de weg." msgstr[1] "" -"Er is meer dan een weg die gebruikt maakt van de knooppunten die u " -"geselecteerd heeft, Selecteer ook de weg." +"Er is meer dan één weg die gebruikt maakt van de knooppunten die u " +"geselecteerd heeft. Selecteer ook de weg." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:247 @@ -2215,5 +2230,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 msgid "Draw lines between raw gps points." -msgstr "Teken lijnen tussen rauwe GPS punten." +msgstr "Teken lijnen tussen rauwe GPS-punten." #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16 @@ -2229,5 +2244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53 msgid "Duplicate nodes that are used by multiple ways." -msgstr "Dupliceer knopen die door meerdere wegen worden gebruikt." +msgstr "Dupliceer knooppunten die door meerdere wegen worden gebruikt." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 @@ -2237,5 +2252,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 msgid "None of these nodes are glued to anything else." -msgstr "Geen van deze knopen is met iets anders verbonden." +msgstr "Geen van deze knooppunten is met iets anders verbonden." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106 @@ -2293,5 +2308,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166 msgid "Unglued Node" -msgstr "Ongebonden knoop" +msgstr "Losgemaakt knooppunt" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 @@ -2312,5 +2327,5 @@ #: ../plugins/smed/src/smed/menu/file/TabManager.java:206 msgid "Undo" -msgstr "herstel" +msgstr "Ongedaan maken" #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 @@ -2347,5 +2362,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27 msgid "Update data" -msgstr "Update data" +msgstr "Gegevens bijwerken" #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 @@ -2880,5 +2895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2886,4 +2901,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3518,7 +3534,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
''{1}''.
This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
''{1}''.
This " "conflict cannot be added." msgstr "" @@ -3532,8 +3548,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Waarschuwing: Laag ''{0}'' bestaat niet meer. 'Kan niet verwijderen' " @@ -3754,9 +3770,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Maak verwijdering ongedaan voor {0} primitief" -msgstr[1] "Maak verwijdering ongedaan voor {0} primitieven" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Verwijder {0} object" +msgstr[1] "Verwijder {0} objecten" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4080,5 +4096,5 @@ msgstr "Niet aanwezig in de cache" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4145,8 +4161,9 @@ msgstr "Samenvoegdoel van type {0} met id {1} ontbreekt" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4311,5 +4328,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "achtergrond" @@ -5030,5 +5047,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5042,4 +5059,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5554,6 +5572,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5671,5 +5689,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "achtergrondafbeelding/luchtfoto" @@ -5929,5 +5947,5 @@ "gebruikt." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5935,10 +5953,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Beeld" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5946,5 +5964,5 @@ msgstr "Gereedschappen" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5952,5 +5970,5 @@ msgstr "Voorkeuze" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5961,5 +5979,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Geluid" @@ -6146,14 +6164,14 @@ #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310 msgid "To delete" -msgstr "" +msgstr "Te verwijderen" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319 msgid "From Relation" -msgstr "" +msgstr "Van relatie" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." -msgstr "" +msgstr "Positie" #. the role column @@ -6171,8 +6189,12 @@ msgid "Click to close the dialog and remove the object from the relations" msgstr "" +"Klik om het dialoogvenster af te sluiten en om het object uit de relaties te " +"verwijderen" #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365 msgid "Click to close the dialog and to abort deleting the objects" msgstr "" +"Klik om het dialoogvenster af te sluiten en om het verwijderen van de " +"objecten af te breken" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:227 @@ -6181,16 +6203,18 @@ "level." msgstr "" +"Gelieve een bereik OSM-tegels op een bepaald " +"zoomniveau te selecteren." #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:234 msgid "Zoom level:" -msgstr "" +msgstr "Zoomniveau:" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:256 msgid "from tile" -msgstr "" +msgstr "van tegel" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259 msgid "up to tile" -msgstr "" +msgstr "tot tegel" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:436 @@ -6201,28 +6225,33 @@ "html>" msgstr "" +"Of u kan een tegeladres ingeven voor een enkele tegel " +"het volgende formaat: zoomniveau/x/y, bv. 15/256/223. " +"Tegeladressen in het formaatzoom,x,y or zoom;x;y zijn ook " +"toegelaten." #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:450 msgid "Tile address:" -msgstr "" +msgstr "Tegeladres:" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:499 msgid "Apply the tile address" -msgstr "" +msgstr "Tegeladres toepassen" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:558 msgid "Please enter a tile address" -msgstr "" +msgstr "Gelieve een tegeladres in te geven" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:560 msgid "The current value isn''t a valid tile address" -msgstr "" +msgstr "De huidige waarde is geen geldig tegeladres" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:606 msgid "Please enter a tile index" -msgstr "" +msgstr "Gelieve een tegelindex op te geven" #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:608 msgid "The current value isn''t a valid tile index for the given zoom level" msgstr "" +"De huidige waarde is geen geldige tegelindex voor het opgegeven zoomniveau" #. * @@ -6250,5 +6279,5 @@ #, java-format msgid "Role {0} is not participating in compare pair {1}." -msgstr "" +msgstr "Rol {0} maakt geen deel uit van vergelijkingspaar {1}." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 @@ -6290,6 +6319,6 @@ msgid "Tags({0} conflict)" msgid_plural "Tags({0} conflicts)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Tags({0} conflict)" +msgstr[1] "Tags({0} conflicten)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 @@ -6297,6 +6326,6 @@ msgid "{0} pending tag conflict to be resolved" msgid_plural "{0} pending tag conflicts to be resolved" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} tagconflict nog op te lossen" +msgstr[1] "{0} tagconflicten nog op te lossen" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 @@ -6308,4 +6337,6 @@ "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +"Samengevoegde knooppuntenlijst bevroren. Er zijn geen conflicten meer in de " +"knooppuntenlijst voor deze weg" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 @@ -6326,4 +6357,6 @@ "relation" msgstr "" +"Samengevoegde ledenlijst bevroren. Er zijn geen conflicten meer in de " +"ledenlijst van deze relatie" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 @@ -6333,5 +6366,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" -msgstr "" +msgstr "Nog op te lossen conflicten in de ledenlijst van deze relatie" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 @@ -6345,24 +6378,28 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" -msgstr "" +msgstr "Nog op te lossen eigenschappenconflicten" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" -msgstr "" +msgstr "Conflictoplossing" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 #, java-format msgid "{0} more..." -msgstr "" +msgstr "{0} meer..." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
because they are deleted in the target dataset:" -msgstr "" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
because " +"they are deleted in the target dataset:" +msgstr "" +"De hiernavolgende primitieven kunnen niet naar de doelprimitief
aangezien " +"ze werden verwijderd in de doeldataset:" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" -msgstr "" +#, fuzzy +msgid "Merging deleted objects failed" +msgstr "Samenvoegen van verwijderde primitieven is mislukt" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 @@ -6371,18 +6408,19 @@ msgid "List in role {0} is currently not participating in a compare pair." msgstr "" +"Lijst in rol {0} maakt op dit moment geen deel uit van een vergelijkingspaar." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:801 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." -msgstr "" +msgstr "Onverwachte waarde voor parameter \"index\". {0} gekregen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:815 #, java-format msgid "Item {0} not found in list." -msgstr "" +msgstr "Item {0} werd niet gevonden in de lijst." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:238 msgid "lock scrolling" -msgstr "" +msgstr "Scrollen vastzetten" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:246 @@ -6397,5 +6435,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:282 msgid "List of elements in my dataset, i.e. the local dataset" -msgstr "" +msgstr "Lijst van elementen in mijn dataset, m.a.w. de lokale dataset" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287 @@ -6418,5 +6456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:294 msgid "List of elements in their dataset, i.e. the server dataset" -msgstr "" +msgstr "Lijst an elementen in hun dataset, m.a.w. de dataset op de server" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:426 @@ -6427,4 +6465,6 @@ msgid "Copy my selected nodes to the start of the merged node list" msgstr "" +"Kopieer de geselecteerde knooppunten naar het begin van de samengevoegde " +"knooppuntenlijst" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:453 @@ -6435,4 +6475,6 @@ msgid "Copy my selected elements to the end of the list of merged elements." msgstr "" +"Kopieer mijn geselecteerde elementen naar het einde van de lijst met " +"samengevoegde elementen" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:482 @@ -6441,4 +6483,6 @@ "merged elements." msgstr "" +"Kopieer mijn geselecteerde elementen voor het begin van de lijst met " +"samengevoegde elementen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:516 @@ -6447,4 +6491,6 @@ "merged elements." msgstr "" +"Kopieer mijn geselecteerde elementen na het eerste geselecteerde element in " +"de lijst van samengevoegde elementen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:545 @@ -6452,8 +6498,12 @@ "Copy their selected element to the start of the list of merged elements." msgstr "" +"Kopieer hun geselecteerde elementen naar het begin van de lijst met " +"samengevoegde elementen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:567 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "" +"Kopieer hun geselecteerde elementen naar het einde van de lijst met " +"samengevoegde elementen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:589 @@ -6462,4 +6512,6 @@ "of merged elements." msgstr "" +"Kopieer hun geselecteerde elementen voor het eerste geselecteerde element in " +"de lijst met samengevoegde elementen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:618 @@ -6468,12 +6520,14 @@ "merged elements" msgstr "" +"Kopieer hun geselecteerde elementen na het eerste geselecteerde element in " +"de lijst met samengevoegde elementen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:644 msgid "Copy all my elements to the target" -msgstr "" +msgstr "Kopieer al mijn elementen naar het doel" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:670 msgid "Copy all their elements to the target" -msgstr "" +msgstr "Kopieer al hun elementen naar het doel" #. Strings in JFileChooser @@ -6495,5 +6549,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:731 msgid "Move down the selected entries by one position." -msgstr "" +msgstr "Verplaats de geselecteerde elementen één positie naar beneden" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 @@ -6513,4 +6567,6 @@ msgid "Remove the selected entries from the list of merged elements." msgstr "" +"Verwijder de geselecteeerde elementen uit de lijst van samengevoegde " +"elementen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792 @@ -6522,5 +6578,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:830 msgid "Freeze the current list of merged elements." -msgstr "" +msgstr "Zet de huidige lijst van samengevoegde elementen vast." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825 @@ -6538,4 +6594,6 @@ "html>" msgstr "" +"Klik {0} om te starten met het samenvoegen van mijn " +"en hun ingaves." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:856 @@ -6545,4 +6603,5 @@ "html>" msgstr "" +"Klik {0} om het samenvoegen te beëindigen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:874 @@ -6591,5 +6650,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" -msgstr "" +msgstr "Eigenschappen in mijn lokale dataset" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 @@ -6598,8 +6657,10 @@ "elements when merge decisions are applied." msgstr "" +"Eigenschappen in het samengevoegde element. Deze zullen de eigenschappen in " +"mijn elementen vervangen wanneer de samenvoegbeslissingen worden toegepast." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" -msgstr "" +msgstr "Eigenschappen in hun serverdataset" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 @@ -6614,10 +6675,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" -msgstr "" - +msgstr "Hier wordt naar gerefereerd door:" + +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(geen)" @@ -6643,25 +6706,27 @@ msgid "Undecide conflict between different coordinates" msgstr "" +"Maak beslissing ongedaan voor conflict tussen verschillende coördinaten" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" -msgstr "" +msgstr "Behoud mijn status van verwijderd" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" -msgstr "" +msgstr "Behoud hun status van verwijderd" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" +msgstr "Maak beslissing ongedaan i.v.m. verwijderd status" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" -msgstr "" +msgstr "Primitief" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121 msgid "Merged nodes not frozen yet. Cannot build resolution command" msgstr "" +"De samengevoegde knooppunten werden nog niet vastgelegd. Er kan nog geen " +"resolutiecommando worden aangemaakt" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 @@ -6682,5 +6747,5 @@ #, java-format msgid "The merged dataset will not include a tag with key {0}" -msgstr "" +msgstr "De samengevoegde dataset zal geen tag bevatten met als sleutel {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48 @@ -6688,5 +6753,5 @@ #, java-format msgid "My dataset does not include a tag with key {0}" -msgstr "" +msgstr "Mijn dataset bevat geen tag met als sleutel {0}" #. setting up the properties table @@ -6727,29 +6792,29 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99 msgid "Cannot apply undecided tag merge item." -msgstr "" +msgstr "Onbeslist tagsamenvoegitem kan niet worden toegepast." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" -msgstr "" +msgstr "Mijn versie (lokale dataset)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" -msgstr "" +msgstr "Hun versie (serverdataset)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" -msgstr "" +msgstr "Behoud de geselecteerde sleutel/waarde-paren uit de lokale dataset" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" -msgstr "" +msgstr "Behoud de geselecteerde sleutel/waarde-paren uit de serverdataset" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" -msgstr "" +msgstr "Maak beslissing ongedaan" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" -msgstr "" +msgstr "Markeer de geselecteerde tags als onbeslist" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 @@ -6757,14 +6822,14 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "" +msgstr "Hun dataset bevat geen tag met als sleutel {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:132 msgid "Conflicts when combining primitives" -msgstr "" +msgstr "Conflicten bij het combineren van primitieven" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:136 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" -msgstr "" +msgstr "Conflicten bij het combineren van wegen - gecombineerde weg is ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:141 @@ -6772,18 +6837,19 @@ msgid "Conflicts when merging nodes - target node is ''{0}''" msgstr "" +"Conflicten bij het combineren van knooppunten - doelknooppunt is ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:283 msgid "No conflicts to resolve" -msgstr "" +msgstr "Er zijn geen conflicten die moeten worden verzoend" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Cancel conflict resolution" -msgstr "" +msgstr "Conflictoplossing afbreken" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284 msgid "Apply resolved conflicts" -msgstr "" +msgstr "Conflictoplossing toepassen" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:361 @@ -6795,5 +6861,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:644 msgid "Apply" -msgstr "" +msgstr "Toepassen" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168 @@ -6814,19 +6880,19 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" -msgstr "" +msgstr "Kies een waarde" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 msgid "Please decide which values to keep" -msgstr "" +msgstr "Gelieve te beslissen welke waardes behouden moeten blijven" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" -msgstr "" +msgstr "Waarde ''{0}'' zal worden toegepast voor ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" -msgstr "" +msgstr "De sleutel ''{0}'' en al z'n waardes zullen worden verwijderd" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 @@ -6834,9 +6900,11 @@ msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" msgstr "" +"Alle waardes bijeengevoegd als ''{0}'' zullen worden toegepast voor sleutel " +"''{1}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100 #, java-format msgid "Tag collection does not include the selected value ''{0}''." -msgstr "" +msgstr "Tagverzameling bevat de geselecteerde waarde ''{0}'' niet." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:135 @@ -6845,36 +6913,36 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:267 msgid "Not decided yet." -msgstr "" +msgstr "Nog onbeslist." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 msgid "Tags from nodes" -msgstr "" +msgstr "Tags van knooppunten" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 msgid "Tags from ways" -msgstr "" +msgstr "Tags van wegen" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 msgid "Tags from relations" -msgstr "" +msgstr "Tags van relaties" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 msgid "Conflicts in pasted tags" -msgstr "" +msgstr "Conflicten in geplakte tags" #: ../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 "" +msgstr "Plakken ..." #: ../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 "" +msgstr "Van ..." #: ../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 "" +msgstr "Naar ..." #. minimum size is relevant for multisplit layout @@ -6884,11 +6952,11 @@ msgid "{0} tag" msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} tag" +msgstr[1] "{0} tags" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6899,5 +6967,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6909,37 +6977,37 @@ #, java-format msgid "Position {0} is out of range. Current number of members is {1}." -msgstr "" +msgstr "Positie {0} valt buiten geldig bereik. Het huidig aantal leden is {1}." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:29 msgid "Remove this relation member from the relation" -msgstr "" +msgstr "Verwijder dit lid uit de relatie" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 msgid "Keep" -msgstr "" +msgstr "Behouden" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33 msgid "Keep this relation member for the target object" -msgstr "" +msgstr "Behoud dit lid van de relatie in het doelobject" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Undecided" -msgstr "" +msgstr "Onbeslist" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37 msgid "Not decided yet" -msgstr "" +msgstr "Nog onbeslist" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:80 msgid "Role:" -msgstr "" +msgstr "Rol:" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:82 msgid "Enter a role for all relation memberships" -msgstr "" +msgstr "Geef een rol op voor alle relatielidmaatschappen" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:99 msgid "Tag modified relations with " -msgstr "" +msgstr "Markeer de gewijzigde relaties met " #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:102 @@ -6948,13 +7016,15 @@ "modified relations." msgstr "" +"Selecteer om het ingeven van een tag die op
alle gewijzigde " +"relaties zal worden toegepast, aan te zetten ." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:105 msgctxt "tag" msgid "Key:" -msgstr "" +msgstr "Sleutel:" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:107 msgid "Enter a tag key, i.e. fixme" -msgstr "" +msgstr "Geef een sleutel op, bv. fixme" #. Strings in GTK ColorChooser @@ -6963,5 +7033,5 @@ #: build/specialmessages.java:96 msgid "Value:" -msgstr "" +msgstr "Waarde:" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:110 @@ -6969,4 +7039,6 @@ "Enter a tag value, i.e. check members" msgstr "" +"Geef een waarde op voor een tag, bv. kijk leden na" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:122 @@ -6979,4 +7051,11 @@ "place of the original way in the relation." msgstr "" +"De gecombineerde wegen zijn leden van een of meerdere relaties Gelieve " +"te beslissen of u deze lidmaatschappen wenst te behouden " +"voor de gecombineerde weg, of deze wenst te verwijderen." +"
Normaal zal de eerste weg behouden blijven en zullen de " +"andere wegen die lid zijn van dezelfde relatie worden verwijderd: de gecombineerde weg vervangt dan de oorspronkelijke weg in de " +"relatie." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:133 @@ -6989,32 +7068,42 @@ "the place of the original node in the relation." msgstr "" +"De gecombineerde knooppunten zijn leden van een of meerdere relaties " +"Gelieve te beslissen of u deze lidmaatschappen wenst te behouden voor het gecombineerde knooppunt, of deze wenst te " +"verwijderen.
Normaal zal het eerste knooppunt " +"behouden blijven en zullen de andere knooppunten die lid " +"zijn van dezelfde relatie worden verwijderd: het " +"gecombineerde knooppunt vervangt dan het oorspronkelijke knooppunt in de " +"relatie." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:147 msgid "Apply this role to all members" -msgstr "" +msgstr "Pas deze rol top alle leden" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51 msgid "Orig. Way" -msgstr "" +msgstr "Oorspronkelijke weg" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" -msgstr "" +msgstr "Beslissing" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43 msgid "Please select the values to keep for the following tags." msgstr "" +"Gelieve de waardes te selecteren die moeten worden behouden voor de " +"volgende tags." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48 msgid "Show tags with conflicts only" -msgstr "" +msgstr "Toon enkel de conflicterende tags" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49 msgid "Show tags with multiple values only" -msgstr "" +msgstr "Toon enkel de tags waarvoor meerdere waardes voorhanden zijn" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161 msgid "For selected objects only" -msgstr "" +msgstr "Enkel voor de geselecteere objecten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162 @@ -7024,17 +7113,21 @@ "html>" msgstr "" +"Aanvinken om enkel changesets te tonen voor de huidig geselecteerde " +"objecten.
Afvinken om alle changesets te tonen voor objecten in de " +"huidige laag." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:134 msgid "Changesets" -msgstr "" +msgstr "Wijzigingenverzamelingen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255 msgid "Open the list of changesets in the current layer." -msgstr "" +msgstr "Open een lijst met changesets in de huidige laag." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300 msgid "Select all objects assigned to the currently selected changesets" msgstr "" +"Selecteer alle objecten die zijn toegewezen aan de geselecteerde changesets" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:349 @@ -7046,18 +7139,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350 msgid "Download information about the selected changesets from the OSM server" -msgstr "" +msgstr "Haal informatie op van de OSM-server over de geselecteerde changesets" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385 msgid "Closes the selected open changesets" -msgstr "" +msgstr "Sluit de geselecteerde open changesets" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:212 msgid "Show info" -msgstr "" +msgstr "Info tonen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417 msgid "Open a web page for each selected changeset" -msgstr "" +msgstr "Open een webpagina voor iedere geselecteerde changeset" #. Strings in JFileChooser @@ -7066,9 +7159,9 @@ #: build/specialmessages.java:47 msgid "Details" -msgstr "" +msgstr "Details" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:457 msgid "Opens the Changeset Manager window for the selected changesets" -msgstr "" +msgstr "Opent het Changeset Managervenster voor de geselecteerde changesets" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:73 @@ -7082,5 +7175,4 @@ msgstr "Een lijst met alle mogelijk opdrachten openen (buffer ongedaan maken)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7091,5 +7183,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7097,7 +7189,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7110,27 +7203,29 @@ "Selects the objects that take part in this command (unless currently deleted)" msgstr "" +"Selecteert de objecten die deel uitmaken van die commando (uitgezonderd de " +"verwijderde objecten)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374 msgid "Undo the selected and all later commands" -msgstr "" +msgstr "Maak de geselecteerde en alle latere opdrachten ongeda" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:380 msgid "Redo the selected and all earlier commands" -msgstr "" +msgstr "Voer de geselecteerde en alle eerdere opdrachten opnieuw uit" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 msgid "Resolve conflicts." -msgstr "" +msgstr "Los conflicten op." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:169 #, java-format msgid "Conflicts: {0} unresolved" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +msgstr "Conflicten: {0} nog op te lossen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7138,5 +7233,5 @@ "lijst openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7149,5 +7244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 msgid "Cancel conflict resolution and close the dialog" -msgstr "" +msgstr "Breek conflictoplossing af en sluit het dialoogvenster" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 @@ -7157,9 +7252,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" -msgstr "" +msgstr "Pas conflictoplossing toe" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Close anyway" -msgstr "" +msgstr "Toch afsluiten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 @@ -7176,8 +7271,14 @@ "{1} to return to resolving conflicts." msgstr "" +"U bent niet klaar met het samenvoegen van de verschillen voor dit " +"conflict.
Conflictoplossingen zullen niet worden toegepast, vooraleer " +"alle verschillen
werden opgelost.
Klik {0} om toch af " +"te sluiten. Reeds
opgeloste verschillen zullen niet in acht " +"worden genomen.
Klik{1} om door te gaan met het " +"oplossen van conflicten." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 msgid "Conflict not resolved completely" -msgstr "" +msgstr "Conflictoplossing nog niet volledig afgehandeld" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:282 @@ -7188,54 +7289,54 @@ #, java-format msgid "Resolve conflicts for ''{0}''" -msgstr "" +msgstr "Conflicten oplossen voor ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 msgid "Filter objects and hide/disable them." -msgstr "" +msgstr "Filter objecten en verberg ze of schakel ze uit" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87 msgid "Add filter." -msgstr "" +msgstr "Voeg filter toe." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 msgid "Edit filter." -msgstr "" +msgstr "Pas filter aan." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112 msgid "Delete filter." -msgstr "" +msgstr "Verwijder filter." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 msgid "Move filter up." -msgstr "" +msgstr "Zet filter hoger" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Move filter down." -msgstr "" +msgstr "Zet filter lager" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147 msgid "Enable filter" -msgstr "" +msgstr "Schakel filter in" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148 msgid "Hide elements" -msgstr "" +msgstr "Verberg elementen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150 msgid "Inverse filter" -msgstr "" +msgstr "Inverteer filter" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151 msgid "Filter mode" -msgstr "" +msgstr "Filtermodus" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" -msgstr "" +msgstr "Filter verborgen: {0} Uitgeschakeld: {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:59 msgid "Error in filter" -msgstr "" +msgstr "Fout in filter" #. translators notes must be in front @@ -7250,5 +7351,5 @@ msgctxt "filter" msgid "H" -msgstr "" +msgstr "V" #. column header: filter text @@ -7262,5 +7363,5 @@ msgctxt "filter" msgid "I" -msgstr "" +msgstr "I" #. column header: filter mode @@ -7268,5 +7369,5 @@ msgctxt "filter" msgid "M" -msgstr "" +msgstr "M" #. translators notes must be in front @@ -7275,5 +7376,5 @@ msgctxt "filter" msgid "R" -msgstr "" +msgstr "V" #. filter mode: add @@ -7281,5 +7382,5 @@ msgctxt "filter" msgid "A" -msgstr "" +msgstr "T" #. filter mode: remove @@ -7287,5 +7388,5 @@ msgctxt "filter" msgid "D" -msgstr "" +msgstr "W" #. filter mode: in selection @@ -7293,23 +7394,23 @@ msgctxt "filter" msgid "F" -msgstr "" +msgstr "F" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:371 msgid "

Filter active

" -msgstr "" +msgstr "

Filter actief

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:377 #, java-format msgid "

{0} objects hidden" -msgstr "" +msgstr "

{0} objecten verborgen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385 #, java-format msgid "{0} objects disabled" -msgstr "" +msgstr "{0} objecten uitgeschakeld" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:388 msgid "

Close the filter dialog to see all objects.

" -msgstr "" +msgstr "

Filterdialoog afsluiten om alle objecten te zien.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -7325,5 +7426,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270 msgid "Object with history" -msgstr "" +msgstr "Object met historiek" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:288 @@ -7342,17 +7443,17 @@ #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:367 msgid "Show" -msgstr "" +msgstr "Weergeven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:329 msgid "Display the history of the selected objects." -msgstr "" +msgstr "Historiek voor de geselecteerde objecten tonen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:63 msgid "Advanced object info" -msgstr "" +msgstr "Geavanceerde objectinformatie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:72 msgid "map style" -msgstr "" +msgstr "kaartstijl" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:92 @@ -7377,9 +7478,27 @@ "deg 42' 52.13\" N, 21 deg 11' 47.60\" E" msgstr "" +"De coördinaten voor het nieuwe knooppunt opgeven.
U kan de lengtegraad " +"en breedtegraad scheiden met een spatie, komma of puntkomma.
Gebruik " +"positieve getallen of N-, E-karakters om Noord- of Oostrichting aan te geven." +"
Voor Zuid- en Westrichting kan u negatieve getallen gebruiken of S, W-" +"karakters.
Coördinaatswaarde kan worden opgegeven op drie manieren:" +"

  • graden°
  • graden° " +"minuten'
  • graden° minuten' seconden"
Symbolen °, ', ′, ", ″ are " +"optional.

Wat voorbeelden:
  • 49.29918° 19.24788°
  • N 49.29918 E 19.24788
  • W 49°29.918' S " +"19°24.788'
  • N 49°29'04" E 19°24'43"" +"
  • 49.29918 N, 19.24788 E
  • 49°29'21" N " +"19°24'38" E
  • 49 29 51, 19 24 18
  • 49 29, 19 24
  • E 49 29, N 19 24
  • 49° 29; 19° 24
  • N 49° 29, " +"W 19° 24
  • 49° 29.5 S, 19° 24.6 E
  • N 49 29.918 E 19 " +"15.88
  • 49 29.4 19 24.5
  • -49 29.4 N -19 24.5 W
  • 48 " +"deg 42' 52.13\" N, 21 deg 11' 47.60\" E
    • " #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:237 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:241 msgid "Please enter a GPS coordinates" -msgstr "" +msgstr "Gelieve GPS-coördinaten op te geven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:267 @@ -7402,5 +7521,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321 msgid "Delete the selected layers." -msgstr "" +msgstr "Verwijder de geselecteerde lagen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:402 @@ -7415,42 +7534,42 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475 msgid "Opacity" -msgstr "" +msgstr "Ondoorzichtigheid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:487 msgid "Adjust opacity of the layer." -msgstr "" +msgstr "Ondoorzichtigheid van de laag aanpassen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:572 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:507 msgid "Activate" -msgstr "" +msgstr "Activeren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 msgid "Activate the selected layer" -msgstr "" +msgstr "De geselecteerde laag activeren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:647 msgid "Merge this layer into another layer" -msgstr "" +msgstr "Deze laag samenvoegen met een andere laag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:701 msgid "Duplicate this layer" -msgstr "" +msgstr "Deze laag dupliceren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:777 msgid "layer is currently visible (click to hide layer)" -msgstr "" +msgstr "laag is nu zichtbaar (klik om ze te verbergen)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:777 msgid "layer is currently hidden (click to show layer)" -msgstr "" +msgstr "laag is nu verborgen (klik om ze te tonen)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:791 msgid "this layer is the active layer" -msgstr "" +msgstr "dit is de actieve laag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:791 msgid "this layer is not currently active (click to activate)" -msgstr "" +msgstr "laag is nu niet actief (klik om ze te activeren)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:881 @@ -7464,66 +7583,67 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:40 msgid "Information about layer" -msgstr "" +msgstr "Informatie over laag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:48 msgid "Map Paint Styles" -msgstr "" +msgstr "Kaarttekenstijlen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87 msgid "configure the map painting style" -msgstr "" +msgstr "Kaarttekenstijl instellen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88 msgid "MapPaint" -msgstr "" +msgstr "KaartTekenen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304 msgid "Turn selected styles on or off" -msgstr "" +msgstr "Zet geselecteerde stijlen aan/uit" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850 msgid "Move the selected entry one row down." -msgstr "" +msgstr "Geselecteerde lijn één rij omlaag." #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850 msgid "Move the selected entry one row up." -msgstr "" +msgstr "Geselecteerde lijn één rij omhoog." #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:383 msgid "Reload from file" -msgstr "" +msgstr "Terugzetten uit bestand" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:384 msgid "reload selected styles from file" -msgstr "" +msgstr "Geselecteerde stijlen terugzetten uit bestand" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:432 msgid "Save as..." -msgstr "" +msgstr "Opslaan als.." #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:433 msgid "Save a copy of this Style to file and add it to the list" msgstr "" +"Sla een kopie van deze stijl op in een bestand en voeg het toe aan de lijst" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:474 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:207 msgid "Reloading style sources" -msgstr "" +msgstr "Terugzetten van stijlbronnen uit bestand" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:487 #, java-format msgid "Save style ''{0}'' as ''{1}''" -msgstr "" +msgstr "Sla stijl ''{0}'' op als ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:543 msgid "view meta information, error log and source definition" -msgstr "" +msgstr "Bekijk meta-informatie, foutenlogboek en brondefinitie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:554 msgid "Map Style info" -msgstr "" +msgstr "Kaartstijlinfo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:581 @@ -7534,29 +7654,29 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:605 msgid "Title:" -msgstr "" +msgstr "Titel" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:607 msgid "URL:" -msgstr "" +msgstr "URL-adres:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609 msgid "Built-in Style, internal path:" -msgstr "" +msgstr "Ingebouwde stijl, intern pad:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611 msgid "Path:" -msgstr "" +msgstr "Pad:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:614 msgid "Icon:" -msgstr "" +msgstr "Icoon:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:617 msgid "Background:" -msgstr "" +msgstr "Achtergrond:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 msgid "Style is currently active?" -msgstr "" +msgstr "Stijl is op dit moment actief?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 @@ -7565,5 +7685,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 msgid "No" -msgstr "" +msgstr "Neen" #. group "Relations" @@ -7595,24 +7715,25 @@ msgid "Create a copy of this relation and open it in another editor window" msgstr "" +"Maak een kopie van de relatie aan en open ze in een ander bewerkvenster" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434 msgid "Set the current selection to the list of selected relations" -msgstr "" +msgstr "Zet de huidige selectie op de lijst van de geselecteerde relaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:461 msgid "Select the members of all selected relations" -msgstr "" +msgstr "Selecteer de leden van alle geselecteerde relaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:463 msgid "Select members" -msgstr "" +msgstr "Selecteer de leden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:493 msgid "Download all members of the selected relations" -msgstr "" +msgstr "Haal alle leden van de geselecteerde relaties op vanaf de server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:494 msgid "Download members" -msgstr "" +msgstr "Haal leden op vanaf de server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:525 @@ -7620,9 +7741,11 @@ msgid "Download incomplete members of selected relations" msgstr "" +"Haal onvolledig afgehaalde leden van de geselecteerde relaties op vanaf de " +"server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:527 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:862 msgid "Download incomplete members" -msgstr "" +msgstr "Haal onvolledig afgehaalde leden op vanaf de server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767 @@ -7642,5 +7765,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:304 msgid "Search for objects" -msgstr "" +msgstr "Zoeken naar objecten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:358 @@ -7656,19 +7779,19 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:424 msgid "Call editor for relation" -msgstr "" +msgstr "Roep bewerkvenster op voor relatie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:425 msgid "Call relation editor for selected relation" -msgstr "" +msgstr "Roep bewerkvenster op voor geselecteerde relatie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1158 msgid "Select in relation list" -msgstr "" +msgstr "Selecteer in relatielijst" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1159 msgid "Select relation in relation list." -msgstr "" +msgstr "Selecteer relatie in relatielijst" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502 @@ -7692,8 +7815,9 @@ msgid "Get detailed information on the internal state of the objects." msgstr "" +"Haal gedetailleerde informatie over de interne staat van de objecten op." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:898 msgid "Inspect" -msgstr "" +msgstr "Inspecteren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:409 @@ -7713,11 +7837,11 @@ msgstr "Klik om de paneelinhoud te verkleinen/vergroten" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Auteurs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Een lijst openen met mensen die aan de geselecteerde objecten werken." @@ -7727,14 +7851,15 @@ msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} Auteur" +msgstr[1] "{0} Auteurs" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" -msgstr "" +#, fuzzy +msgid "Select objects submitted by this user" +msgstr "Selecteer primitieven die werden bijgedragen door deze gebruiker" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:213 msgid "Launches a browser with information about the user" -msgstr "" +msgstr "Toont informatie over deze gebruiker in een browservenster" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:225 @@ -7743,4 +7868,6 @@ "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" +"Opgelet: er wordt slecht voor de eerste {0} van de {1} geselecteerde " +"gebruikers een infovenster geopend" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:248 @@ -7750,12 +7877,14 @@ "this system." msgstr "" +"Het was niet mogelijk om een URL samen te stellen, omdat de encodering " +"''{0}''
    niet voorhanden is op dit systeem." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:250 msgid "Missing encoding" -msgstr "" +msgstr "encodering niet voorhanden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:273 msgid "Load CT" -msgstr "" +msgstr "CT (bijdragevoorwaarden) laden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:274 @@ -7764,8 +7893,11 @@ "agreed to the new contributor terms will show a green check mark." msgstr "" +"Haalt informatie over de herlicentiëringsstatus op van de server. Gebruikers " +"die hebben ingestemd met de nieuwe bijdragevoorwaarden hebben een groen " +"vinkje naast hun gebruikersnaam." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:322 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:342 @@ -7779,5 +7911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:342 msgid "CT" -msgstr "" +msgstr "CT (bijdragevoorwaarden)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:91 @@ -7797,4 +7929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Herstellen" @@ -7830,34 +7963,36 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:529 msgid "Fixing errors ..." -msgstr "" +msgstr "Herstellen van fouten ..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:552 #, java-format msgid "Fixing ({0}/{1}): ''{2}''" -msgstr "" +msgstr "({0}/{1}): ''{2}'' worden hersteld" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:567 msgid "Updating map ..." -msgstr "" +msgstr "Kaart wordt bijgewerkt ..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179 msgid "Display the basic properties of the changeset" -msgstr "" +msgstr "Toon de basiseigenschappen van de wijzigingenverzameling" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181 msgid "Display the tags of the changeset" -msgstr "" +msgstr "Toon de tags van de wijzigingenverzameling" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182 msgid "Content" -msgstr "" +msgstr "Inhoud" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183 msgid "Display the objects created, updated, and deleted by the changeset" msgstr "" +"De gecreëerde/bijgewerkte en verwijderde objecten tonen per " +"wijzigingenverzameling" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:267 msgid "Changeset Management Dialog" -msgstr "" +msgstr "Wijzigingenverzameling beheervenster" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339 @@ -7865,52 +8000,60 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200 msgid "Close the dialog" -msgstr "" +msgstr "Het dialoogvenster sluiten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:356 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163 msgid "Query" -msgstr "" +msgstr "Zoekopdracht" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358 msgid "Launch the dialog for querying changesets" msgstr "" +"Het dialoogvenster voor het bevragen van de wijzigingenverzamelingen openen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265 msgid "Remove from cache" -msgstr "" +msgstr "Uit cachegeheugen verwijderen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383 msgid "Remove the selected changesets from the local cache" msgstr "" +"De geselecteerde wijzigingenverzamelingen uit het lokale cachegeheugen " +"verwijderen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410 msgid "Close the selected changesets" -msgstr "" +msgstr "De geselecteerde wijzigingenverzamelingen afsluiten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323 msgid "Update changeset" -msgstr "" +msgstr "Wijzigingenverzameling bijwerken" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450 msgid "Updates the selected changesets with current data from the OSM server" msgstr "" +"Dit werkt de geselecteerde wijzigingenverzamelingen bij met de huidige " +"gegevens vanaf de OSM-server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475 msgid "Download changeset content" -msgstr "" +msgstr "Wijzigingenverzamelinginhoud afhalen op de server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477 msgid "Download the content of the selected changesets from the server" msgstr "" +"Inhoud voor de geselecteerde wijzigingenverzamelingen afhalen op de server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510 msgid "My changesets" -msgstr "" +msgstr "Mijn wijzigingenverzamelingen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512 msgid "Download my changesets from the OSM server (max. 100 changesets)" msgstr "" +"Haal mijn wijzigingenverzamelingen op vanaf de OSM-server (maximaal 100 " +"wijzigingenverzamelingen)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518 @@ -7924,5 +8067,5 @@ msgctxt "changeset.upload-comment" msgid "empty" -msgstr "" +msgstr "leeg" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62 @@ -7930,5 +8073,5 @@ msgctxt "changeset.state" msgid "Open" -msgstr "" +msgstr "Open" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64 @@ -7936,5 +8079,5 @@ msgctxt "changeset.state" msgid "Closed" -msgstr "" +msgstr "Afgesloten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73 @@ -7942,9 +8085,9 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 msgid "anonymous" -msgstr "" +msgstr "anoniem" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30 msgid "Comment" -msgstr "" +msgstr "Commentaar" #. Strings in JFileChooser @@ -7952,5 +8095,5 @@ #: build/specialmessages.java:70 msgid "Open" -msgstr "" +msgstr "Openen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46 @@ -7961,9 +8104,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54 msgid "Created at" -msgstr "" +msgstr "Gecreëerd op" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62 msgid "Closed at" -msgstr "" +msgstr "Afgesloten op" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69 @@ -7974,5 +8117,5 @@ #: ../plugins/reverter/src/reverter/corehacks/OsmServerChangesetReader.java:184 msgid "Downloading changeset content" -msgstr "" +msgstr "Afhalen van wijzigingenverzamelingsinhoud" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170 @@ -7991,5 +8134,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306 msgid "Download content" -msgstr "" +msgstr "Inhoud afhalen van server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178 @@ -7998,33 +8141,35 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308 msgid "Download the changeset content from the OSM server" -msgstr "" +msgstr "Wijzigingenverzamelingsgegevens afhalen van OSM-server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310 msgid "Update content" -msgstr "" +msgstr "Inhoud bijwerken" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312 msgid "Update the changeset content from the OSM server" -msgstr "" +msgstr "Wijzigingenverzamelingsinhoud bijwerken vanaf de OSM-server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 msgid "Show history" -msgstr "" +msgstr "Geschiedenis tonen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "Historiek van de geselecteerde primitieven afhalen en tonen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356 msgid "Select in layer" -msgstr "" +msgstr "Selecteren in laag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317 msgid "Select the corresponding primitives in the current data layer" msgstr "" +"Selecteren van de overeenstemmende primitieven in de huidige gegevenslaag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324 @@ -8038,52 +8183,59 @@ "''{0}''." msgstr[0] "" +"Het geselecteerde object is niet beschikbaar in de " +"huidige
    bewerkingslaag''{0}''." msgstr[1] "" +"Geen van de geselecteerde objecten is beschikbaar in de " +"huidige
    bewerkingslaag''{0}''." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370 msgid "Nothing to select" -msgstr "" +msgstr "Niets dat geselecteerd kan worden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415 msgid "Zoom to in layer" -msgstr "" +msgstr "Inzoomen in laag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "Inzoomen naar de overeenstemmende primitieven in de huidige datalaag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:429 msgid "Nothing to zoom to" -msgstr "" +msgstr "Er is niets waarop ingezoomd kan worden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:445 msgid "The content of this changeset is not downloaded yet." msgstr "" +"De inhoud van deze wijzigingenverzameling is nog niet afgehaald van de " +"server." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:463 msgid "Download now" -msgstr "" +msgstr "Nu afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464 msgid "Download the changeset content" -msgstr "" +msgstr "Wijzigingenverzamelinginhoud nu afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50 msgid "Created" -msgstr "" +msgstr "Aangemaakt" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51 msgid "Updated" -msgstr "" +msgstr "Bijgewerkt" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52 msgid "Deleted" -msgstr "" +msgstr "Verwijderd" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32 msgid "ID" -msgstr "" +msgstr "ID" #. Strings in JFileChooser @@ -9137,33 +9289,35 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115 msgid "ID:" -msgstr "" +msgstr "ID:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128 msgid "Comment:" -msgstr "" +msgstr "Toelichting:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143 msgid "Open/Closed:" -msgstr "" +msgstr "Open/Gesloten:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155 msgid "Created by:" -msgstr "" +msgstr "Gemaakt door:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168 msgid "Created on:" -msgstr "" +msgstr "Aangemaakt op:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180 msgid "Closed on:" -msgstr "" +msgstr "Afgesloten op:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267 msgid "Remove the changeset in the detail view panel from the local cache" msgstr "" +"Verwijder de wijzigingenverzameling in het detailoverzichtspaneel van de " +"lokale cache" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325 msgid "Update the changeset from the OSM server" -msgstr "" +msgstr "Werk de wijzigingenverzameling bij vanaf de OSM-server" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358 @@ -9172,4 +9326,6 @@ "layer" msgstr "" +"Selecteer de primitieven in de inhoud van deze wijzigingenverzameling in de " +"huidige datalaag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365 @@ -9180,10 +9336,15 @@ "the current
    edit layer ''{1}''." msgstr "" +"Geen van de objecten in de inhoud van wijzigingenverzameling {0} is " +"beschikbaar in de huidige
    bewerkingslaag ''{1}''." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" +"Zoom in naar de primitieven in de inhoud van deze wijzigingenverzameling in " +"de huidige datalaag" #. parent for dialog is Main.parent @@ -9191,26 +9352,26 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127 msgid "Download changesets" -msgstr "" +msgstr "Wijzigingenverzamelingen afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36 #, java-format msgid "{0} [incomplete]" -msgstr "" +msgstr "{0} [onvolledig]" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 msgid "open" -msgstr "" +msgstr "open" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 msgid "closed" -msgstr "" +msgstr "gesloten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45 msgid "Changeset ID: " -msgstr "" +msgstr "Wijzigingenverzameling ID: " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47 msgid "Enter a changeset id" -msgstr "" +msgstr "Geef een wijzigingenverzamelings-ID op" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79 @@ -9218,4 +9379,6 @@ "Download the changeset with the specified id, including the changeset content" msgstr "" +"Haal de wijzigingenverzameling met het opgegeven id op, inclusief de " +"wijzigingenverzamelingsinhoud" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141 @@ -9224,4 +9387,6 @@ "> 0" msgstr "" +"De huidige waarde is geen geldig wijzigingenverzamelings-ID. Gelieve een " +"geheel getal > 0 in te geven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143 @@ -9229,13 +9394,16 @@ #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48 msgid "Please enter an integer value > 0" -msgstr "" +msgstr "Gelieve een geheel getal > 0 in te geven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74 msgid "Select changesets owned by specific users" msgstr "" +"Selecteer wijzigingenverzamelingen met specifieke gebruikers als eigenaar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93 msgid "Select changesets depending on whether they are open or closed" msgstr "" +"Selecteer wijzigingenverzamelingen afhankelijk van of ze open of gesloten " +"zijn" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112 @@ -9243,40 +9411,48 @@ "Select changesets based on the date/time they have been created or closed" msgstr "" +"Selecteer wijzigingenverzamelingen op basis van de datum/tijd dat ze " +"gecreëerd of afgesloten werden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132 msgid "Select only changesets related to a specific bounding box" msgstr "" +"Selecteer enkel wijzigingenverzamelingen die betrkking hebben op een " +"specifieke omvattende rechthoek" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302 msgid "Query open changesets only" -msgstr "" +msgstr "Zoek enkel in open wijzigingenverzamelingen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311 msgid "Query closed changesets only" -msgstr "" +msgstr "Zoek enkel in afgesloten wijzigingenverzamelingen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320 msgid "Query both open and closed changesets" -msgstr "" +msgstr "Zoek zowel in open als afgesloten wijzigingenverzamelingen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389 msgid "User ID:" -msgstr "" +msgstr "Gebruikers-ID:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409 msgid "User name:" -msgstr "" +msgstr "Gebruikersnaam:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445 msgid "Only changesets owned by myself" -msgstr "" +msgstr "Enkel wijzigingenverzamelingen waarvan ikzelf eigenaar ben" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457 msgid "Only changesets owned by the user with the following user ID" msgstr "" +"Enkel wijzigingenverzamelingen waarvan de gebruiker met het opgegeven " +"gebruikers-ID eigenaar is" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475 msgid "Only changesets owned by the user with the following user name" msgstr "" +"Enkel wijzigingenverzamelingen waarvan de gebruiker met de opgegeven " +"gebruikersnaam eigenaar is" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527 @@ -9285,9 +9461,11 @@ "is anonymous" msgstr "" +"De bevraging van de wijzigingenverzameling kan niet beperkt worden tot de " +"huidige gebruiker, aangezien de huidige gebruiker anoniem is" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533 #, java-format msgid "Current value ''{0}'' for user ID is not valid" -msgstr "" +msgstr "Huidige waarde ''{0}'' als gebruikers-ID is niet geldig" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536 @@ -9295,45 +9473,49 @@ msgid "Cannot restrict the changeset query to the user name ''{0}''" msgstr "" +"De bevraging van de wijzigingenverzameling kan niet tot de volgende " +"gebruikersnaam ''{0}'' beperkt worden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553 msgid "Please enter a valid user ID" -msgstr "" +msgstr "Gelieve een geldig gebruikers-ID op te geven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554 msgid "Invalid user ID" -msgstr "" +msgstr "Ongeldig gebruikers-ID" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563 msgid "Please enter a non-empty user name" -msgstr "" +msgstr "Gelieve een niet-lege gebruikersname op te geven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564 msgid "Invalid user name" -msgstr "" +msgstr "Ongeldige gebruikersnaam" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656 msgid "Date: " -msgstr "" +msgstr "Datum: " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684 msgid "Closed after - " -msgstr "" +msgstr "Afgesloten na - " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720 msgid "Date:" -msgstr "" +msgstr "Datum:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714 msgid "Created before - " -msgstr "" +msgstr "Gecreëerd voor - " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765 msgid "Only changesets closed after the following date/time" -msgstr "" +msgstr "Enkel wijzigingenverzamelingen afgesloten na de volgende datum/tijd" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786 msgid "Only changesets closed after and created before a specific date/time" msgstr "" +"Enkel wijzigingenverzamelingen afgesloten na en aangemaakt voor een " +"specifieke datum/tijd" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837 @@ -9342,4 +9524,6 @@ "valid." msgstr "" +"Wijzigingenverzamelingszoekopdracht kan niet opgebouwd worden a.d.h.v de " +"opgegeven tijdgerelateerde beperkinen. Invoer is niet geldig." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865 @@ -9351,5 +9535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868 msgid "Invalid date/time values" -msgstr "" +msgstr "Ongeldige datum/tijd-waardes" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942 @@ -9358,4 +9542,6 @@ "invalid." msgstr "" +"Kan de wijzigingenverzamelingsbevraging niet beperken tot een specifieke " +"omvattende rechthoek. De invoer is ongeldig." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951 @@ -9364,8 +9550,11 @@ "changeset query to a specific bounding box." msgstr "" +"Gelieve geldige waardes voor lengtegraad-/breedtegraad op te geven om " +"
    de wijzigingenverzamelingsbevraging tot een specifieke omvattende " +"rechthoek te beperken." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954 msgid "Invalid bounding box" -msgstr "" +msgstr "Ongeldige omvattende rechthoek" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989 @@ -9374,4 +9563,6 @@ "The current value is not a valid user ID. Please enter an integer value > 0" msgstr "" +"De huidige waarde is geen geldig gebruikers-ID. Gelieve een geheel getal > 0 " +"in te geven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030 @@ -9380,8 +9571,10 @@ "empty user name." msgstr "" +"De huidige waarde is geen geldige gebruikersnaam.
    Gelieve een niet-" +"lege gebruikersnaam op te geven." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033 msgid "Please enter an non-empty user name" -msgstr "" +msgstr "Gelieve een niet-lege gebruikersnaam op te geven" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063 @@ -9391,4 +9584,6 @@ "
    Example: {1}
    Example: {2}
    Example: {3}
    " msgstr "" +"Gelieve een datum in te geven in het gebruikelijke formaat voor uw locatie." +"
    Voorbeeld: {0}
    Voorbeeld: {1}
    Voorbeeld: {2}
    Voorbeeld: {3}
    " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127 @@ -9398,8 +9593,10 @@ "{0}
    Example: {1}
    Example: {2}
    Example: {3}
    " msgstr "" +"Gelieve een tijd in te geven in het gebruikelijke formaat voor uw locatie." +"
    Voorbeeld: {0}
    Voorbeeld: {1}
    Voorbeeld: {2}
    Voorbeeld: {3}
    " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108 msgid "Download my changesets only" -msgstr "" +msgstr "Haal enkel mijn eigen wijzigingenverzamelingen af" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109 @@ -9408,4 +9605,7 @@ "include all changesets in the query." msgstr "" +"Aanvinken om de bevraging te beperken tot uw eigen " +"wijzigingenverzamelingen.
    Afvinken om alle wijzigingenverzamelingen in de " +"bevraging op te nemen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126 @@ -9416,8 +9616,12 @@ "max. 100 changesets." msgstr "" +"Gelieve één van de volgende standaardbevragingen te " +"selecteren. Selecteer Enkel mijn wijzigingenverzamelingen afhalen indien u enkel wijzigingenverzamelingen wenst af te halen die uzelf " +"aanmaakte.
    JOSM zal max. 100 wijzigingenverzamelingen afhalen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147 msgid "Download the latest changesets" -msgstr "" +msgstr "Haal de laatste wijzigingenverzamelingen af" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:154 @@ -9426,8 +9630,11 @@ "user name in the preferences first." msgstr "" +"Haal mijn openstaande wijzigingenverzamelingen " +"op
    Uitgeschakeld. Gelieve eerst uw OSM-gebruikersnaam in de " +"instellingen in te geven." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157 msgid "Download my open changesets" -msgstr "" +msgstr "Haal mijn openstaande wijzigingenverzamelingen af" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165 @@ -9436,8 +9643,11 @@ "currently no map view active." msgstr "" +"Haal mijn wijzigingenverzamelingen in het huidige kaartzicht af." +"
    Uitgeschakeld. Er is op dit moment geen kaartzich actief." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168 msgid "Download changesets in the current map view" msgstr "" +"Afhalen wijzigingenverzamelingen in het huidige kaartzicht" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193 @@ -9447,4 +9657,6 @@ "default query." msgstr "" +"Opgelet: onverwachte waarde voor voorkeursinstelling ''{0}'', waarde is " +"''{1}''. Teruggezet naar standaardbevraging." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51 @@ -9457,12 +9669,13 @@ msgid "Download changesets using predefined queries" msgstr "" +"Afhalen van wijzigingenverzamelingen a.d.h.v. voorgedefinieerde bevragingen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54 msgid "From URL" -msgstr "" +msgstr "Van URL" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55 msgid "Query changesets from a server URL" -msgstr "" +msgstr "Wijzigingenverzamelingen opvragen vanaf een server URL" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57 @@ -9470,54 +9683,59 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138 msgid "Advanced" -msgstr "" +msgstr "Geavanceerd" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58 msgid "Use a custom changeset query" -msgstr "" +msgstr "Gebruikmaken van een eigen wijzigingenverzamelingbevraging" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82 msgid "Query changesets" -msgstr "" +msgstr "Wijzigingenverzamelingen bevragen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165 msgid "Query and download changesets" -msgstr "" +msgstr "Wijzigingenverzamelingen bevragen en afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171 msgid "Please enter a valid changeset query URL first." msgstr "" +"Gelieve eerst een geldige wijzigingenverzamelingbevragings-URL op te geven." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172 msgid "Illegal changeset query URL" -msgstr "" +msgstr "Ongeldige wijzigingenverzamelingbevragings-URL" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209 msgid "Close the dialog and abort querying of changesets" msgstr "" +"Close het dialoogvenster en breek het bevragen van de " +"wijzigingenverzamelingen af" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71 msgid "Querying and downloading changesets" -msgstr "" +msgstr "Bevragen en afhalen van wijzigingenverzamelingen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136 msgid "Determine user id for current user..." -msgstr "" +msgstr "Gebruikers-ID voor huidige user bepalen..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164 msgid "Query and download changesets ..." -msgstr "" +msgstr "Bevragen en afhalen van wijzigingenverzamelingen ..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42 msgid "URL: " -msgstr "" +msgstr "URL: " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70 msgid "Please enter or paste an URL to retrieve changesets from the OSM API." msgstr "" +"Gelieve een URL in te geven of te plakken wijzigingenverzamelingen vanaf de " +"OSM API op te halen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71 msgid "Examples" -msgstr "" +msgstr "Voorbeelden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76 @@ -9527,8 +9745,11 @@ "regardless of the host, port and path of the URL entered below." msgstr "" +"Bemerk dat wijzigingenverzamelingsbevragingen op dit moment altijd " +"doorgegeven worden naar ''{0}'', ongeacht de host, port en pad van de " +"hieronder opgegeven URL." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174 msgid "This changeset query URL is invalid" -msgstr "" +msgstr "Deze wijzigingenverzamelingsbevragings-URL is ongeldig" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169 @@ -9653,5 +9874,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9662,25 +9883,26 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1155 msgid "Select relation in main selection." -msgstr "" +msgstr "Selecteer relation in main selection." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 msgid "Edit the relation the currently selected relation member refers to." msgstr "" +"Bewerk de relatie waarnaar het momenteel geselecteerde relatielid verwijst." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220 msgid "Download all child relations (recursively)" -msgstr "" +msgstr "Afhalen alle kindrelaties (recursief)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222 msgid "Download All Children" -msgstr "" +msgstr "Alle Kinderen Afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241 msgid "Download selected relations" -msgstr "" +msgstr "Geselecteerde relaties afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245 msgid "Download Selected Children" -msgstr "" +msgstr "Geselecteerde kinderen afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290 @@ -9690,5 +9912,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:64 msgid "Download relation members" -msgstr "" +msgstr "Relatieleden afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331 @@ -9698,6 +9920,6 @@ msgid "Conflict in data" msgid_plural "Conflicts in data" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Conflict in gegevens" +msgstr[1] "Conflicten in gegevens" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:344 @@ -9705,5 +9927,5 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9716,5 +9938,5 @@ #, java-format msgid "Downloading relation {0}" -msgstr "" +msgstr "Afhalen van relatie {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 @@ -9727,4 +9949,6 @@ msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +"Waarschuwing: uitzondering werd genegeerd omdat de taak werd geannuleerd. " +"Uitzondering: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:93 @@ -9733,6 +9957,6 @@ msgid "Downloading {0} incomplete child of relation ''{1}''" msgid_plural "Downloading {0} incomplete children of relation ''{1}''" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Afhalen van {0} onvolledig kind van relatie ''{1}''" +msgstr[1] "Afhalen van {0} onvolledige kinderen van relatie ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:100 @@ -9740,36 +9964,37 @@ msgid "Downloading {0} incomplete child of {1} parent relations" msgid_plural "Downloading {0} incomplete children of {1} parent relations" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Afhalen van {0} onvolledig kind van {1} ouderrelaties" +msgstr[1] "Afhalen van {0} onvolledige kinderen van {1} ouderrelaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 msgid "Download relations" -msgstr "" +msgstr "Afhalen van relaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 #, java-format msgid "({0}/{1}): Downloading relation ''{2}''..." -msgstr "" +msgstr "({0}/{1}): Afhalen van relatie ''{2}''..." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173 msgid "Tags and Members" -msgstr "" +msgstr "Tags en leden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:175 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:183 msgid "Parent Relations" -msgstr "" +msgstr "Ouderrelaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:176 msgid "Child Relations" -msgstr "" +msgstr "Kindrelaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Apply Role:" -msgstr "" +msgstr "Rol toepassen;" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:318 msgid "Enter a role and apply it to the selected relation members" msgstr "" +"Geef een rol op om deze toe op de geselecteerde relatieleden toe te passen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601 @@ -9779,4 +10004,7 @@ "
    How do you want to proceed with circular dependencies?" msgstr "" +"Er is minstens één lid in deze relatie dat
    naar de relatie zelf " +"terugverwijst.
    Dit zorgt voor circulaire afhankelijkheden en wordt " +"afgeraden.
    Wenst u door te gaan met circulaire afhankelijkheden?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:608 @@ -9787,17 +10015,21 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:608 msgid "Ignore them, leave relation as is" -msgstr "" +msgstr "Negeer ze, behoud relatie zoals ze is" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" +"Deze relatie bevat al één of meerdere leden die verwijzen naar
    de " +"primitief ''{0}''

    Wenst u deze werkelijk nogmaals toe te voegen aan " +"de relatie?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" -msgstr "" +#, fuzzy +msgid "Multiple members referring to same object." +msgstr "Meerdere leden die naar dezelfde primitief verwijzen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:699 @@ -9808,76 +10040,94 @@ "''{0}''." msgstr "" +"U tracht een relatie aan zichzelf toe te voegen.

    Dit creëert " +"circulaire referenties en wordt daarom afgeraden.
    Relatie ''{0}'' werd " +"niet toegevoegd." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "" +"Voeg alle primitieven die geselecteerd werden in de huidige " +"gegevensverzameling toe vóór het eerste lid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "" +"Voeg alle primitieven die geselecteerd werden in de huidige " +"gegevensverzameling toe achter het laatste lid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" +"Voeg alle primitieven die geselecteerd werden in de huidige " +"gegevensverzameling toe vóór het eerste geselecteerde lid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" +"Voeg alle primitieven die geselecteerd werden in de huidige " +"gegevensverzameling toe achter het laatste geselecteerde lid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "" +"Verwijder alle leden die naar één van de geselecteerde primitieven verwijzen" #. putValue(NAME, tr("Remove Selected")); #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 msgid "Relation Editor: Remove Selected" -msgstr "" +msgstr "Relatiebewerkvenster: Geselecteerde Verwijderen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" -msgstr "" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" +msgstr "" +"Selecteer relatieleden die verwijzen naar primitieven in de huidige selectie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" -msgstr "" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" +msgstr "" +"Selecteer relatieleden die verwijzen naar {0} primitieven in de huidige " +"selectie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Selecteer de leden van alle geselecteerde relaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Sort the relation members" -msgstr "" +msgstr "De relatieleden sorteren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Sort" -msgstr "" +msgstr "Sorteren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953 msgid "Relation Editor: Sort" -msgstr "" +msgstr "Relatiebewerkvenster: Sorteren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:973 msgid "Reverse the order of the relation members" -msgstr "" +msgstr "Volgorde van relatieleden omkeren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:975 msgid "Reverse" -msgstr "" +msgstr "Omkeren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976 msgid "Relation Editor: Reverse" -msgstr "" +msgstr "Relatiebewerkvenster: Omkeren" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996 @@ -9888,5 +10138,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:999 msgid "Relation Editor: Move Up" -msgstr "" +msgstr "Relatiebewerkvenster: Omhoog verplaatsen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1015 @@ -9897,18 +10147,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1018 msgid "Relation Editor: Move Down" -msgstr "" +msgstr "Relatiebewerkvenster: Omlaag verplaatsen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034 msgid "Remove the currently selected members from this relation" -msgstr "" +msgstr "De geselecteerde leden uit de relatie verwijderen" #. putValue(NAME, tr("Remove")); #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1037 msgid "Relation Editor: Remove" -msgstr "" +msgstr "Relatiebewerkvenster: Verwijderen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 msgid "Delete the currently edited relation" -msgstr "" +msgstr "De relatie die op dit moment bewerkt wordt verwijderen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 @@ -9945,8 +10195,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." msgstr "" @@ -9998,32 +10249,34 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." -msgstr "" +#, fuzzy +msgid "This is equal to deleting the roles of these objects." +msgstr "Dit is gelijk aan het verwijderen van de rollen van deze primitieven." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 msgid "Do you really want to apply the new role?" -msgstr "" +msgstr "Bent u zeker dat u de nieuwe rol wenst toe te passen?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Yes, apply it" -msgstr "" +msgstr "Ja, toepassen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "No, do not apply" -msgstr "" +msgstr "Neen, niet toepassen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1397 msgid "Confirm empty role" -msgstr "" +msgstr "Lege rol bevestigen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1465 msgid "Edit the relation the currently selected relation member refers to" msgstr "" +"De relatie, waar het nu geselecteerde relatielid heen verwijst, wijzigen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1542 @@ -10032,4 +10285,6 @@ "current layer" msgstr "" +"Leden in plakbuffer kunnen niet worden toegevoegd omdat ze geen deel " +"uitmaken van de huidige laag" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 @@ -10037,5 +10292,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:388 msgid "Zoom to" -msgstr "" +msgstr "Inzoomen op" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 @@ -10043,21 +10298,23 @@ msgid "Zoom to the object the first selected member refers to" msgstr "" +"Inzoomen op het object waar het eerst geselecteerde lid naartoe verwijst" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 msgid "Zooming disabled because layer of this relation is not active" msgstr "" +"In-/Uitzoomen uitgeschakeld omdat de laag van deze relatie niet actief is" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216 msgid "Zooming disabled because there is no selected member" -msgstr "" +msgstr "In-/Uitzoomen uitgeschakeld omdat er geen lid geselecteerd is" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:27 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:29 msgid "Refers to" -msgstr "" +msgstr "Verwijst naar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76 msgid "Download referring relations" -msgstr "" +msgstr "Verwijzende relaties afhalen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:186 @@ -10070,20 +10327,22 @@ msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" msgstr "" +"Waarschuwing: Uitzondering wordt genegeerd omdat de taak werd geanulleerd. " +"Uitzondering: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:62 msgid "including immediate children of parent relations" -msgstr "" +msgstr "Inclusief direct kinderen van ouderrelaties" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:90 msgid "Load parent relations" -msgstr "" +msgstr "Ouderrelaties laden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:106 msgid "Loading parent relations" -msgstr "" +msgstr "Ouderrelaties worden geladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:139 msgid "Edit the currently selected relation" -msgstr "" +msgstr "Geselecteerde relatie wijzigen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 @@ -10094,19 +10353,19 @@ #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" +msgstr "Nieuwe relatie in laag ''{0}'' aanmaken" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:136 #, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "" +msgstr "Nieuwe relatie in laag ''{0}'' bewerken" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:138 #, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "" +msgstr "Nieuwe relatie #{0} in laag ''{1}'' bewerken" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:116 msgid "Load relation" -msgstr "" +msgstr "Relatie laden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:162 @@ -10115,20 +10374,22 @@ "Warning: ignoring exception because task was cancelled. Exception was: {0}" msgstr "" +"Waarschuwing: uitzondering wordt genegeerd omdat de taak werd afgebroken. " +"Uitzondering was: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:79 msgid "way is connected" -msgstr "" +msgstr "weg is verbonden" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81 msgid "way is connected to previous relation member" -msgstr "" +msgstr "weg is verbonden met vorig relatielid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:83 msgid "way is connected to next relation member" -msgstr "" +msgstr "weg is verbonden met volgend relatielid" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:85 msgid "way is not connected to previous or next relation member" -msgstr "" +msgstr "weg is niet verbonden met vorig of volgend relatielid" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110 @@ -10138,5 +10399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152 msgid "There is currently no download area selected." -msgstr "" +msgstr "Er is momenteel geen afhaalgebied geselecteerd." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154 @@ -10145,12 +10406,14 @@ "maxlat): " msgstr "" +"Huidig afhaalgebied (minlon, minlat, maxlon, maxlat): " +"" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183 msgid "Create bookmark" -msgstr "" +msgstr "Bladwijzer aanmaken" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185 msgid "Add a bookmark for the currently selected download area" -msgstr "" +msgstr "Bladwijzer aanmaken voor het momenteel geselecteerde afhaalgebied" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192 @@ -10158,4 +10421,6 @@ "Currently, there is no download area selected. Please select an area first." msgstr "" +"Er is, op dit moment, geen afhaalgebied geselecteerd. Gelieve eerst een " +"gebied aan te duiden." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201 @@ -10163,17 +10428,18 @@ msgid "Please enter a name for the bookmarked download area." msgstr "" +"Gelieve een naam voor de bladwijzer voor het aangeduide gebied in te geven." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254 msgid "Name of location" -msgstr "" +msgstr "Naam voor locatie" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217 msgid "Remove the currently selected bookmarks" -msgstr "" +msgstr "De geselecteerde bladwijzers verwijderen" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242 msgid "Rename the currently selected bookmark" -msgstr "" +msgstr "De geselecteerde bladwijzers herbenoemen" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105 @@ -10195,5 +10461,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114 msgid "Clear textarea" -msgstr "" +msgstr "Tekstgebied leegmaken" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123 @@ -10215,25 +10481,25 @@ #, java-format msgid "The string ''{0}'' is not a valid double value." -msgstr "" +msgstr "De letterreeks ''{0}'' kan niet worden omgezet naar een geldig getal." #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164 msgid "Value for latitude in range [-90,90] required." -msgstr "" +msgstr "Waarde voor breedtegraad lager dan [-90,90] wordt vereist." #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204 msgid "Value for longitude in range [-180,180] required." -msgstr "" +msgstr "Een waarde voor de lengtegraad in het bereik [-180,180] is benodigd." #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235 msgid "Paste URL from clipboard" -msgstr "" +msgstr "URL-adres uit klembord plakken" #. adding the download tasks #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97 msgid "Data Sources and Types:" -msgstr "" +msgstr "Databronnen en types:" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98 @@ -10243,5 +10509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99 msgid "Select to download OSM data in the selected download area." -msgstr "" +msgstr "Aanvinken om OSM-gegevens af te halen in het geselecteerde gebied" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:101 @@ -10251,5 +10517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:102 msgid "Select to download GPS traces in the selected download area." -msgstr "" +msgstr "Aanvinken om GPS-sporen af te halen in het geselecteerde gebied" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:133 @@ -10262,8 +10528,11 @@ "into the currently active data layer." msgstr "" +"Aanvinken om afgehaalde gegevens in een nieuwe laag onderbrengen." +"
    Afvinken om afgehaalde gegevens in de momenteel actieve laag bij te " +"plaatsen." #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219 msgid "No area selected yet" -msgstr "" +msgstr "Er werd nog geen gebied geselecteerd" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222 @@ -10279,8 +10548,8 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:378 msgid "Click to close the dialog and to abort downloading" -msgstr "" +msgstr "Klik om het dialoogvenster te sluiten en om het afhalen af te breken" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -10288,4 +10557,5 @@ msgid "Please select a download area first." msgstr "" +"Gelieve eerst een gebied t selecteren waarvoor u gegevens wenst af te halen" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:411 @@ -10293,5 +10563,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." +"
    Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10307,14 +10577,14 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75 msgid "Near" -msgstr "" +msgstr "Nabij" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75 msgctxt "placeselection" msgid "Zoom" -msgstr "" +msgstr "Inzoomen" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102 msgid "Choose the server for searching:" -msgstr "" +msgstr "Kies een server om te doorzoeken:" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:110 @@ -10324,5 +10594,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:113 msgid "Enter a place name to search for" -msgstr "" +msgstr "Geef een plaatsnaam op om naar te zoeken" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:149 @@ -10337,17 +10607,17 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:287 msgid "Search ..." -msgstr "" +msgstr "Zoek …" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:289 msgid "Click to start searching for places" -msgstr "" +msgstr "Aanvinken om te beginnen met zoeken naar plaatsen" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:329 msgid "Querying name server" -msgstr "" +msgstr "Naamserver bevragen" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:362 msgid "Querying name server ..." -msgstr "" +msgstr "Naamserver wordt bevraagd ..." #. Strings in JFileChooser @@ -10375,4 +10645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10452,10 +10723,13 @@ msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}" msgstr "" +"CSS-bestand ''help-browser.css'' kon niet worden ingelezen. Uitzondering is: " +"{0}" #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183 msgid "JOSM Help Browser" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +msgstr "JOSM Help-Browser" + +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10463,11 +10737,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10477,6 +10751,10 @@ "p>" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +"

    Fout bij het ophalen van hulpinformatie

    De inhoud voor het hulponderdeel {0} kon niet worden ingeladen. Dit is de (onvertaalde) foutboodschap:" +"
    {1}

    " + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10484,20 +10762,23 @@ "network problem, please check
    your internet connection" msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +"Het openen van de hulptekst op webpagina {0} is mislukt.
    Dit ligt " +"waarschijnlijk aan een netwerkprobleem, gelieve
    uw internetverbinding na " +"te kijken" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" -msgstr "" +msgstr "Het openen van de webpagina is mislukt" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" -msgstr "" +msgstr "De huidige hulppagina openen in een extern browservenster" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +msgstr "De huidige hulppagina bewerken" + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10507,33 +10788,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10541,36 +10822,38 @@ #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:180 msgid "Latitude: " -msgstr "" +msgstr "Breedtegraad: " #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:198 msgid "Longitude: " -msgstr "" +msgstr "Lengtegraad: " #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" -msgstr "" +msgstr "Coördinaten" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48 #, java-format msgid "History for node {0}" -msgstr "" +msgstr "Historiek voor knooppunt {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49 #, java-format msgid "History for way {0}" -msgstr "" +msgstr "Historiek voor weg {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50 #, java-format msgid "History for relation {0}" -msgstr "" +msgstr "Historiek voor relatie {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149 msgid "Reload the history from the server" -msgstr "" +msgstr "Historiek opnieuw laden van de server" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272 msgid "History not initialized yet. Failed to set reference primitive." msgstr "" +"Historiek is nog niet geïnitialiseerd. Er kon geen referentieprimitief " +"worden ingesteld." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274 @@ -10580,4 +10863,6 @@ "Failed to set reference. Reference ID {0} does not match history ID {1}." msgstr "" +"Er kon geen referentie worden ingesteld. Het referentie-ID {0} komt niet " +"overeen met historiek-ID {1}." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277 @@ -10601,20 +10886,20 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67 msgid "Load history" -msgstr "" +msgstr "Historiek laden" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186 #, java-format msgid "Loading history for node {0}" -msgstr "" +msgstr "Historiek voor knooppunt {0} wordt geladen" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187 #, java-format msgid "Loading history for way {0}" -msgstr "" +msgstr "Historiek voor weg {0} wordt geladen" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188 #, java-format msgid "Loading history for relation {0}" -msgstr "" +msgstr "Historiek voor relatie {0} wordt geladen" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 @@ -10622,9 +10907,9 @@ #, java-format msgid "Node {0}" -msgstr "" +msgstr "Knooppunt {0}" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 msgid "Zoom to node" -msgstr "" +msgstr "Inzoomen naar knooppunt" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 @@ -10639,19 +10924,23 @@ #, java-format msgid "Way {0}" -msgstr "" +msgstr "Weg {0}" #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" -msgstr "" +msgstr "Relatie {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Object" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 msgid "not present" -msgstr "" +msgstr "niet aanwezig" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:56 msgid "Changeset" -msgstr "" +msgstr "Wijzigingenverzameling" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92 @@ -10678,33 +10967,33 @@ #, java-format msgid "Show changeset {0}" -msgstr "" +msgstr "Wijzigingenverzameling {0} tonen" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:63 #, java-format msgid "Version {0}, {1} (by {2})" -msgstr "" +msgstr "Versie {0}, {1} (door {2})" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:79 #, java-format msgid "Version {0} created on {1} by {2}" -msgstr "" +msgstr "Versie {0}, aangemaakt op {1} (door {2})" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:107 #, java-format msgid "Version {0} in editor" -msgstr "" +msgstr "Versie {0} in bewerkvenster" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:109 msgid "[deleted]" -msgstr "" +msgstr "[verwijderd]" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:119 #, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "" +msgstr "Version {0} wordt momenteel bewerkt in gegevenslaag ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" -msgstr "" +msgstr "Versie" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 @@ -10763,5 +11052,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Conflicten gedetecteerd" @@ -10848,9 +11137,9 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 msgid "Created at:" -msgstr "" +msgstr "Aangemaakt op:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 msgid "Changeset comment:" -msgstr "" +msgstr "Wijzigingenverzameling opmerking:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -11407,13 +11696,17 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Waarschuwing: object \"{0}\" is reeds verwijderd op de server. Sla dit " +"object over, versturen wordt opnieuw uitgevoerd" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Gegevens voorbereiden..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11544,15 +11837,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Waarschuwing: object \"{0}\" is reeds verwijderd op de server. Sla dit " -"object over, versturen wordt opnieuw uitgevoerd" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11561,5 +11843,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11753,4 +12035,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11832,5 +12115,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12048,23 +12331,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Gegevenslaag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "buiten gedownload gebied" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "versie {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12073,11 +12356,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12086,32 +12369,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} bestaat uit:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API-versie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Naar GPX-laag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Vond volgende problemen:" @@ -12854,6 +13137,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12877,7 +13160,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12892,5 +13175,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13801,4 +14084,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Geen" @@ -13915,15 +14199,13 @@ msgstr "Sneltekenen (minder fraai)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Alleen op de kop van een weg." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14082,15 +14364,20 @@ msgstr "GPS-punten" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Richtingwijzers voor wegsegmenten tekenen." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -14099,10 +14386,10 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14110,9 +14397,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "De inactieve gegevenslagen in een andere kleur tekenen." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14120,5 +14407,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM-gegevens" @@ -15382,4 +15669,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Valideren" @@ -16013,5 +16301,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -16065,9 +16353,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16076,21 +16364,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16098,69 +16386,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Changeset sluiten" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17734,5 +18022,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19650,5 +19938,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19900,4 +20188,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20599,5 +20888,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20701,4 +20990,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20897,22 +21190,22 @@ msgstr "Firefox-executable" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21546,4 +21839,14 @@ msgid "Waypoints" msgstr "Waypoints" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relatie-editor: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22681,4 +22984,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22868,11 +23227,4 @@ "cannot apply your changes and continue editing.

    Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." msgstr "" @@ -24411,6 +24763,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24420,15 +24777,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24436,5 +24793,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24442,10 +24799,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24454,5 +24811,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24461,15 +24818,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24477,20 +24834,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24500,5 +24857,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24507,15 +24864,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24525,20 +24882,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24548,15 +24905,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24565,5 +24922,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24572,10 +24929,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24584,15 +24947,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24602,5 +24965,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24609,20 +24972,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40044,4 +40407,341 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "afgekorte straatnaam" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "éénrichtingstag op een knoop" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "brugtag op een knoop" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "gekeerde snelwegtag op een knoop" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "snelweg zonder een referentie" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "type tijdelijke snelweg" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "verkeerd gespelde sleutelnaam" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "fietspad met fietstag" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "voetpad met voettag" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "maak fietsbaan als strook op een fietspad" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "blokkade gebruikt om een weg" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "max. snelheid voor een voetpad" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "laagtag met een + teken" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "straatnaam bevat ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relatie zonder type" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurant zonder naam" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "ongebruikelijke tagcombinatie" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Map met luchtfoto's openen" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Straten NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE-kaarten" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE-kaarten (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italië" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicilië - Italië" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "aan {0} primitief" +#~ msgstr[1] "aan {0} primitieven" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Maak verwijdering ongedaan voor {0} primitief" +#~ msgstr[1] "Maak verwijdering ongedaan voor {0} primitieven" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
    ''{1}''." +#~ "
    Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Laag ''{0}'' heeft al een conflict voor primitief
    ''{1}''." +#~ "
    Gelieve eerst dit \r\n" +#~ "conflict op te lossen en dan opnieuw te proberen." + #~ msgid "Please enter a name for the location." #~ msgstr "Voer een naam in voor de locatie." @@ -40172,7 +40872,4 @@ #~ "Server antwoordde met interne fout. Verklein het gebied of probeer het " #~ "later nog eens." - -#~ msgid "Preparing data..." -#~ msgstr "Gegevens voorbereiden..." #~ msgid "Error during parse." @@ -40315,7 +41012,4 @@ #~ msgid "Cannot connect to server." #~ msgstr "Kan niet met server verbinden." - -#~ msgid "Object" -#~ msgstr "Object" #~ msgid "There are unsaved changes. Delete the layer anwyay?" @@ -41199,13 +41893,4 @@ #~ msgstr "Het opslaan is mislukt." -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "Open Aerial Map" -#~ msgstr "Map met luchtfoto's openen" - -#~ msgid "NPE Maps" -#~ msgstr "NPE-kaarten" - #~ msgid "Edit Hiking" #~ msgstr "Wandelen bewerken" @@ -41370,4 +42055,7 @@ #~ msgstr "Ingevoerde tijd kon niet worden ontleed." +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)." + #~ msgid "Create non-audio markers when reading GPX." #~ msgstr "Niet-geluidsmarkers tijdens lezen GPX aanmaken." @@ -41447,58 +42135,4 @@ #~ msgstr "Oberpfalz Geofabrik.de" -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Straten NRW Geofabrik.de" - -#~ msgid "oneway tag on a node" -#~ msgstr "éénrichtingstag op een knoop" - -#~ msgid "bridge tag on a node" -#~ msgstr "brugtag op een knoop" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "gekeerde snelwegtag op een knoop" - -#~ msgid "highway without a reference" -#~ msgstr "snelweg zonder een referentie" - -#~ msgid "temporary highway type" -#~ msgstr "type tijdelijke snelweg" - -#~ msgid "misspelled key name" -#~ msgstr "verkeerd gespelde sleutelnaam" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "fietspad met fietstag" - -#~ msgid "footway with tag foot" -#~ msgstr "voetpad met voettag" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "maak fietsbaan als strook op een fietspad" - -#~ msgid "barrier used on a way" -#~ msgstr "blokkade gebruikt om een weg" - -#~ msgid "maxspeed used for footway" -#~ msgstr "max. snelheid voor een voetpad" - -#~ msgid "layer tag with + sign" -#~ msgstr "laagtag met een + teken" - -#~ msgid "street name contains ss" -#~ msgstr "straatnaam bevat ss" - -#~ msgid "abbreviated street name" -#~ msgstr "afgekorte straatnaam" - -#~ msgid "relation without type" -#~ msgstr "relatie zonder type" - -#~ msgid "restaurant without name" -#~ msgstr "restaurant zonder naam" - -#~ msgid "unusual tag combination" -#~ msgstr "ongebruikelijke tagcombinatie" - #~ msgid "Station" #~ msgstr "Station" @@ -41562,7 +42196,4 @@ #~ msgid "Please select one or more closed ways of at least four nodes." #~ msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren." - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE-kaarten (Tim)" #~ msgid "Football" @@ -41784,7 +42415,4 @@ #~ msgid "Move Down" #~ msgstr "Omlaag bewegen" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relatie-editor: {0}" #~ msgid "Solve Conflict" @@ -42231,13 +42859,4 @@ #~ msgstr "Error tijdens het communiceren met de server." -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" @@ -42245,7 +42864,4 @@ #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" #~ msgid "" @@ -42392,10 +43008,4 @@ #~ "Tenminste één object benodigd voor verwijderen, kreeg lege verzameling" -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italië" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicilië - Italië" - #~ msgid "Cannot open directory.
    Please select a file!" #~ msgstr "" @@ -42476,2 +43086,40 @@ #~ msgid "alpine_hiking" #~ msgstr "hooggebergtetrektocht" + +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Open browservenster met wikihulp voor het geselecteerde object" + +#~ msgid "" +#~ "The child relation
    {0}
    is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "De kindrelatie
    {0}
    werd verwijderd op de server. Ze kan niet " +#~ "geladen worden." + +#~ msgid "Click do download the currently selected area" +#~ msgstr "Klik om het momenteel geselecteerde gebied af te halen" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Noch {0} noch {1} is ingeschakeld." +#~ "
    Gelieve te kiezen om ofwel OSM-gegevens, ofwel GPX-gegevens, ofwel " +#~ "beide af te halen." + +#~ msgid "" +#~ "

    Help content for help topic missing

    " +#~ msgstr "" +#~ "

    Hulpinhoud voor hulpthema ontbreekt

    Hulpinhoud voor hulpthema {0} is nog niet beschikbaar. Het ontbreekt in uw eigen taal ({1}) en " +#~ "in het Engels.

    Gelieve uw steentje bij te dragen om het JOSM " +#~ "hulpsysteem te verbeteren en vul de ontbrekende informatie in. U kan het " +#~ "hulpthema in uw eigen taal ({1}) en het hulpthema in het Engels verbeteren..

    " Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 25650) +++ /applications/editors/josm/i18n/po/pl.po (revision 25651) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-01 22:21+0000\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-09 11:55+0000\n" "Last-Translator: Rafał \n" "Language-Team: Polish \n" @@ -17,6 +17,6 @@ "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: 2011-03-06 15:17+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:31+0000\n" +"X-Generator: Launchpad (build 12617)\n" "X-Poedit-Country: POLAND\n" "X-Poedit-Language: Polish\n" @@ -25,10 +25,10 @@ #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -38,12 +38,12 @@ msgstr "Pomoc" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Pominięto niepoprawny URL do pliku: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -79,7 +79,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -112,14 +112,14 @@ msgstr "Uwaga" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parametr \"downloadgsp\" nie przyjmuje nazw plików lub adresów URL" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Pominięto niepoprawny URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -132,13 +132,13 @@ "JOSM (Kompatybilnych z Java 5).Więcej informacji:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Zamknij JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Kontynuuj mimo to" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -159,4 +159,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -198,18 +199,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -228,4 +229,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "O programie" @@ -312,8 +315,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "UWAGA: nieznany format adresu URL API. Przekierowanie do strony " @@ -418,4 +421,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -500,5 +504,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -587,6 +591,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -629,51 +633,51 @@ msgstr "Wybierz co najmniej trzy węzły." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "dane" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "warstwa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "zaznaczenie" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "pobrany obszar" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "poprzedni" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "następny" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Brak zaznaczenia, które można pokazać" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Pokaż {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Powiększ aby pokazać: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -683,5 +687,5 @@ msgstr "Widok: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Brak konfliktów, które można pokazać" @@ -987,9 +991,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "Wyświetl historię zaznaczonego obiektu." + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -998,5 +1003,5 @@ msgstr "Powiel" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Powiela zaznaczone obiekty." @@ -1104,5 +1109,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1464,5 +1469,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Włącz wybrane elementy do innej warstwy" @@ -1741,7 +1747,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1765,10 +1771,10 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "do {0} elementu" -msgstr[1] "do {0} elementów" -msgstr[2] "do {0} elementów" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Usunięto {0} objekt" +msgstr[1] "Usunięto {0} objekty" +msgstr[2] "Usunięto {0} objektów" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1881,4 +1887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2825,5 +2832,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2831,4 +2838,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3432,5 +3440,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3445,5 +3453,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3658,9 +3666,10 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Usunięto {0} objekt" +msgstr[1] "Usunięto {0} objekty" +msgstr[2] "Usunięto {0} objektów" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3975,5 +3984,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4034,8 +4043,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4192,5 +4202,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "tło" @@ -4889,5 +4899,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4901,4 +4911,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5395,6 +5406,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5514,5 +5525,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5754,5 +5765,5 @@ msgstr "Ustawienie {0} zostało usunięte, ponieważ nie jest już używane." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5760,10 +5771,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Widok" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5771,5 +5782,5 @@ msgstr "Narzędzia" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5777,5 +5788,5 @@ msgstr "Szablony" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5786,5 +5797,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Dźwięk" @@ -6186,11 +6197,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" -msgstr "" +#, fuzzy +msgid "Merging deleted objects failed" +msgstr "Tylko dla zaznaczonych obiektów" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 @@ -6453,8 +6465,10 @@ msgstr "Odwołania do:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(brak)" @@ -6494,5 +6508,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6726,6 +6739,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6737,5 +6750,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6930,5 +6943,4 @@ msgstr "Otwiera lista wszystkich wykonanych operacji (historia poleceń)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6939,5 +6951,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6945,7 +6957,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6976,13 +6989,13 @@ msgstr "Konflikty: {0} nierozwiązanych" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Rozwiąż" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7556,11 +7569,11 @@ msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autorzy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Otwiera listę ludzi pracujących nad zaznaczonymi obiektami." @@ -7574,5 +7587,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7640,4 +7653,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Napraw" @@ -7864,5 +7878,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Pobiera i pokazuje historię zaznaczonych elementów" @@ -7906,5 +7921,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Powiększa odpowiadające elementy na edytowanej warstwie danych" @@ -9040,6 +9056,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9529,5 +9546,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9581,5 +9598,5 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9669,10 +9686,10 @@ msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9686,16 +9703,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects 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:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects 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:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9704,6 +9722,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9712,6 +9731,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Otwiera listę ludzi pracujących nad zaznaczonymi obiektami." #. putValue(NAME, tr("Remove Selected")); @@ -9722,6 +9742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9729,10 +9748,10 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Zaznacza elementy dla wybranych członków relacji" @@ -9825,8 +9844,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." msgstr "" @@ -9878,11 +9898,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" +msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -10165,5 +10186,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -10176,5 +10197,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." +"
    Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10258,4 +10279,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10340,5 +10362,6 @@ msgstr "Przeglądarka pomocy JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10346,11 +10369,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10361,5 +10384,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10371,19 +10394,19 @@ "połączenie z internetem" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Nie można otworzyć adresu URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Otwiera tę stronę pomocy w zewnętrznej przeglądarce" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Edytuje tę stronę pomocy" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10393,33 +10416,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Odświerza stronę pomocy" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Przechodzi do poprzedniej strony" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Przechodzi do następnej strony" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10531,4 +10554,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Obiekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10641,5 +10668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Wykryto konflikty" @@ -11277,13 +11304,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Przygotowanie warstwy \"{0}\" do wysłania..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11442,13 +11471,4 @@ msgstr "Zestaw zmian jest pełny" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11457,5 +11477,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11656,4 +11676,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11738,5 +11759,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11958,23 +11979,23 @@ msgstr "BŁĄD" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Warstwa danych {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "poza pobranym obszarem" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "wersja {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11984,11 +12005,11 @@ msgstr[2] "Wykryto {0} konfliktów." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Kliknij aby zamknąć okno i kontynuować edycję" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11997,32 +12018,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "Obiekty na warstwie {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "nieznana" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Wersja API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Konwertuj na warstwę GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Test zgodności zestawu danych" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Nie znaleziono żadnych problemów" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Znaleziono następujące problemy:" @@ -12746,6 +12767,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12769,7 +12790,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12784,5 +12805,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13398,4 +13419,6 @@ "so you can not use it. This message will not show again." msgstr "" +"Ta warstwa nie wspiera żadnego z odwzorowań JOSM,\n" +"więc nie może zostać użyta. Ta wiadomość nie wyświetli się ponownie." #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:130 @@ -13684,4 +13707,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "żadne" @@ -13798,15 +13822,13 @@ msgstr "Szybsze rysowanie (wygląda gorzej)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Tylko na początku drogi." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13964,25 +13986,30 @@ msgstr "Punkty GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Rysuje strzałki kierunkowe dla segmentów drogi." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Rysuje kolejne numery wszystkich segmentów drogi." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Stosuje antialiasing dla widoku mapy dając gładszy wygląd." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Rysuje granice obszaru danych pobranych z serwera." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -13991,9 +14018,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Zaznacza nieaktywne warstwy danych innym kolorem." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14001,5 +14028,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Dane OSM" @@ -14177,5 +14204,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:781 msgid "Projection" -msgstr "" +msgstr "Odwzorowanie" #: ../core/src/org/openstreetmap/josm/gui/preferences/ImagerySettingsMigration.java:47 @@ -15268,4 +15295,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Zweryfikuj" @@ -15904,5 +15932,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15956,9 +15984,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Ta wersja JOSM jest niekompatybilna z konfiguracją serwera." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15967,21 +15995,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15989,69 +16017,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Tworzenie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Pomyślnie otwarto zestaw zmian {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Oczekiwano ID zestawu zmian > 0. Otrzymano {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Uaktualnianie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Uaktualnianie zestawu zmian {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Zamykanie zestawu zmian..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Przygotowywanie zapytania przesyłania..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Oczekiwanie 10 sekund... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Ponowna próba {0} z {1} za {2} sekund..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - próbuję ponownie." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Ponowna próba {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Obecny zestaw zmian jest pusty. Nie można przesłać danych." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17626,5 +17654,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19523,5 +19551,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19773,4 +19801,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20458,5 +20487,5 @@ msgstr "" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20560,4 +20589,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20754,22 +20787,22 @@ msgstr "Ścieżka do programu Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -20781,5 +20814,5 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238 msgid "Select projection..." -msgstr "" +msgstr "Wybierz odwzorowanie..." #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:243 @@ -20862,5 +20895,5 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:354 msgid "Projection:" -msgstr "" +msgstr "Odwzorowanie:" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:361 @@ -20884,9 +20917,9 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:431 msgid "Projection Preferences" -msgstr "" +msgstr "Ustawienia odwzorowania" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:478 msgid "Close the dialog and apply projection preferences" -msgstr "" +msgstr "Zamyka okno i zastosowuje ustawienia odwzorowania" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:491 @@ -21403,4 +21436,14 @@ msgid "Waypoints" msgstr "Punkty drogowe" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Edytor relacji: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22538,4 +22581,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22725,11 +22824,4 @@ "cannot apply your changes and continue editing.

    Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." msgstr "" @@ -24265,6 +24357,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24274,15 +24371,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "Rozszerza opcje edycji opening_hours" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje zgłoszone problemy z OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24290,5 +24387,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24296,10 +24393,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24308,5 +24405,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24317,15 +24414,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24333,20 +24430,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24356,5 +24453,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24363,15 +24460,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24381,20 +24478,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24404,15 +24501,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24421,5 +24518,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24428,10 +24525,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24442,15 +24545,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24460,5 +24563,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24469,20 +24572,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39904,4 +40007,329 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "skrótowa nazwa ulicy" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "etykieta \"jednokierunkowa\" na węźle" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "etykieta \"most\" na węźle" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "Błędny znacznik highway na węźle" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Nienazwana niesklasyfikowana droga" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "Droga bez numeru referencyjnego" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "tymczasowy typ drogi" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "błędnie wpisana nazwa klucza" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "nazwa ulicy zawiera ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "Relacja bez typu" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restauracja bez nazwy" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (lustro)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Ulice NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czechy CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czechy UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "Mapy NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japonia (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japonia (ORTO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japonia (ORTO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japonia (ORTO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Włochy" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sycylia - Włochy" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - Włochy" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps (Francja)" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "do {0} elementu" +#~ msgstr[1] "do {0} elementów" +#~ msgstr[2] "do {0} elementów" + #~ msgid "Move" #~ msgstr "Przenieś" @@ -39942,7 +40370,4 @@ #~ msgid "Unsaved Changes" #~ msgstr "Niezapisane zmiany" - -#~ msgid "Object" -#~ msgstr "Obiekt" #~ msgid "OSM password" @@ -40083,4 +40508,7 @@ #~ msgstr "Proxy - hasło" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)" + #~ msgid "Keep backup files" #~ msgstr "Pozostawiaj kopie zapasowe plików" @@ -40281,13 +40709,4 @@ #~ msgid "Charge" #~ msgstr "Opłata" - -#~ msgid "street name contains ss" -#~ msgstr "nazwa ulicy zawiera ss" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "Mapy NPE" #~ msgid "WMS" @@ -40548,10 +40967,4 @@ #~ msgstr "Most zwodzony" -#~ msgid "bridge tag on a node" -#~ msgstr "etykieta \"most\" na węźle" - -#~ msgid "oneway tag on a node" -#~ msgstr "etykieta \"jednokierunkowa\" na węźle" - #~ msgid "Grid" #~ msgstr "Siatka" @@ -40831,18 +41244,6 @@ #~ msgstr "Świat" -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Maps (Tim)" - #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "abbreviated street name" -#~ msgstr "skrótowa nazwa ulicy" - -#~ msgid "restaurant without name" -#~ msgstr "restauracja bez nazwy" #~ msgid "park_and_ride" @@ -40998,13 +41399,4 @@ #~ msgstr "Sklep sportowy" -#~ msgid "relation without type" -#~ msgstr "Relacja bez typu" - -#~ msgid "highway without a reference" -#~ msgstr "Droga bez numeru referencyjnego" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "Błędny znacznik highway na węźle" - #~ msgid "Navigation" #~ msgstr "Nawigacja" @@ -41033,7 +41425,4 @@ #~ msgid "Click Reload to refresh list" #~ msgstr "Kliknij \"Odśwież\" by zaktualizować listę" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Edytor relacji: {0}" #~ msgid "Move Up" @@ -41127,10 +41516,4 @@ #~ msgstr[1] "Pobrano informacje o wtyczkach z {0} serwerów" #~ msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów" - -#~ msgid "misspelled key name" -#~ msgstr "błędnie wpisana nazwa klucza" - -#~ msgid "temporary highway type" -#~ msgstr "tymczasowy typ drogi" #~ msgid "" @@ -41320,7 +41703,4 @@ #~ msgstr "Wykryto konflikt" -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Ulice NRW Geofabrik.de" - #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" @@ -41328,16 +41708,4 @@ #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Nienazwana niesklasyfikowana droga" #~ msgid "Upload to OSM API failed" @@ -41405,7 +41773,4 @@ #~ msgid "standard" #~ msgstr "standardowy" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" #~ msgid "Could not read file ''{0}''.
    Error is:
    {1}" @@ -41571,28 +41936,4 @@ #~ msgstr "" #~ "\"{0}\" nie jest połączona i z tego powodu nie można połączyć obszarów" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sycylia - Włochy" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czechy UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czechy CUZK:KM" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Włochy" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japonia (ORTO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japonia (ORTO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japonia (ORTO03)" #~ msgid "Create a new map." @@ -41654,7 +41995,4 @@ #~ msgstr "Dostosowuje pozycję wybranej warstwy WMS" -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japonia (ORTHO)" - #~ msgid "Used style" #~ msgstr "Używany styl" @@ -41727,13 +42065,4 @@ #~ "Yahoo, ...)." -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (lustro)" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - Włochy" - -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps (Francja)" - #~ msgid "Post Code" #~ msgstr "Kod pocztowy" Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 25650) +++ /applications/editors/josm/i18n/po/pt_BR.po (revision 25651) @@ -9,5 +9,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-02-02 15:12+0000\n" "Last-Translator: Wille \n" @@ -17,16 +17,16 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:14+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:33+0000\n" +"X-Generator: Launchpad (build 12617)\n" "Language: pt_BR\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -36,12 +36,12 @@ msgstr "Ajuda" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorando URL de arquivo mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -77,7 +77,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -110,15 +110,15 @@ msgstr "Aviso" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Parâmetro \"downloadgps\" não aceita nomes de arquivos ou URLs de arquivos." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorando URL mal formada: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -131,13 +131,13 @@ "anterior (compatível com Java 5) do JOSM.Mais informação:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Sair do JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Continuar, tentar assim mesmo" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -158,4 +158,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -197,18 +198,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -227,4 +228,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Sobre" @@ -311,8 +314,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "Aviso: formato inesperado da URL base da API. Redireccionar para a " @@ -419,4 +422,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -501,5 +505,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -588,6 +592,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -630,51 +634,51 @@ msgstr "Por favor, selecione no mínimo 3 nós." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "dados" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "camada" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "seleção" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "conflito" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "baixar" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "anterior" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "próxima" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Não há nada selecionado para se aproximar." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Aproximar para {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Aproximar a visão para {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -684,5 +688,5 @@ msgstr "Visão: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Não há conflitos para se aproximar" @@ -987,10 +991,11 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "" "Descarregamento primitivas referenciadas a uma das primitivas selecionadas" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -999,5 +1004,5 @@ msgstr "Duplicar" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicar seleção através de cópia e colagem imediata." @@ -1106,5 +1111,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1480,5 +1485,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Combinar primitivas selecionadas atualmente em outra camada" @@ -1764,8 +1770,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Os dados copiados contem primitivas incompletas. Ao colar se apagarão as " @@ -1792,9 +1799,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "Para {0} primitiva" -msgstr[1] "Para {0} primitivas" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Apagar {0} objeto" +msgstr[1] "Apagar {0} objetos" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1914,4 +1921,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2865,5 +2873,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2871,4 +2879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3508,7 +3517,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3522,8 +3531,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Aviso: Camada \"{0}\" já não existe mais. Não foi possível remover a " @@ -3740,9 +3749,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Recuperar {0} primitiva" -msgstr[1] "Recuperar {0} primitivas" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Apagar {0} objeto" +msgstr[1] "Apagar {0} objetos" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4065,5 +4074,5 @@ msgstr "Não está no cache" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4129,8 +4138,9 @@ msgstr "Faltando alvo de mescla para tipo {0} com id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4294,5 +4304,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "segundo plano" @@ -5010,5 +5020,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5022,4 +5032,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5527,6 +5538,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5644,5 +5655,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Imagens" @@ -5898,5 +5909,5 @@ msgstr "Configuração {0} das preferências foi removida pois não é mais usada." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5904,10 +5915,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Vista" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5915,5 +5926,5 @@ msgstr "Ferramentas" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5921,5 +5932,5 @@ msgstr "Predefinições" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5930,5 +5941,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Áudio" @@ -6335,7 +6346,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "" "As seguintes primitivas não puderam ser copiadas para a primitiva " @@ -6343,5 +6355,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Falha ao mesclar primitivos removidos" @@ -6623,8 +6636,10 @@ msgstr "Referenciado por:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(nenhum)" @@ -6664,5 +6679,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Primitivo" @@ -6899,6 +6913,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6909,5 +6923,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7120,5 +7134,4 @@ msgstr "Abrir uma lista de todos os comandos (desfazer buffer)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7129,5 +7142,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7135,7 +7148,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7168,13 +7182,13 @@ msgstr "Conflitos: {0} não resolvidos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Abrir uma janela de união dos itens selecionados na lista acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7775,11 +7789,11 @@ msgstr "Clique para minimizar/maximizar o conteúdo do painel" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autores" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Abrir lista de pessoas trabalhando nos objetos selecionados." @@ -7793,5 +7807,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Selecionar primitivas enviadas pelo usuário" @@ -7866,4 +7881,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Corrigir" @@ -8093,5 +8109,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Baixe e mostre o histórico das primitivas selecionadas" @@ -8132,5 +8149,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Aproximar-se dos primitivos correspondentes na camada de dados atual" @@ -9267,6 +9285,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9794,6 +9813,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Iniciar navegador com a ajuda do wiki para objetos selecionados" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9846,8 +9865,6 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" -msgstr "" -"A relação filha
    {0}
    foi deletada no servidor. Ela não pode ser " -"carregada." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9936,8 +9953,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" @@ -9946,5 +9963,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Múltiplos membros referenciando a mesma primitiva" @@ -9961,6 +9979,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Adicionar todas primitivas selecionadas nos dados atuais antes do primeiro " @@ -9968,6 +9986,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Adicionar todas primitivas selecionadas nos dados atuais depois do primeiro " @@ -9975,6 +9993,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9983,6 +10002,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9991,5 +10011,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Remove todos os membros referentes ao um dos primitivos selecionados" @@ -10001,19 +10022,19 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "" "Selecionar membros da relação que referenciam primitivas na seleção atual" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Selecionar membros da relação que referenciam {0} primitivas na seleção atual" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Selecione primitivas para as relações de membros selecionadas" @@ -10113,11 +10134,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." -msgstr "" -"A camada \"{0}\" já tem um conflito para a primitiva
    \"{1}\"." -"
    Por favor, primeiro resolva esse conflito e então tente de novo." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -10167,12 +10187,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Você está escolhendo um papel vazio em {0} primitiva." msgstr[1] "Você está escolhendo um papel vazio em {0} primitivas." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Isso é igual a remover os papéis dessas primitivas." @@ -10465,6 +10486,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Clique para baixar a área selecionada atualmente" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10476,8 +10497,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Nem {0} nem {1} estão ativos.
    Por " -"favor, escolha baixar dados do OSM, ou dados GPX ou ambos." +"
    Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10560,4 +10579,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10642,5 +10662,6 @@ msgstr "Navegador de Help do JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10648,18 +10669,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -"

    Conteúdo de ajuda para o tópico não " -"existe

    O conteúdo do tópico de ajuda {0}" -" ainda não está disponível. Ele está faltando tanto na sua língua " -"local ({1}) como em inglês.

    Por favor ajude a melhorar o sistema de " -"ajuda do JOSM inserindo a informação que está faltando. Você pode tanto " -"editar o     tópico de ajuda no seu idioma ({1}) ou o tópico de ajudo em inglês.

    " - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10674,5 +10688,5 @@ "p>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10683,19 +10697,19 @@ "acontecido por problemas de rede,
    por favor, cheque sua conexão" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Falha ao abrir URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Abrir página atual de ajuda em browser externo" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Editar página de ajuda atual" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10707,33 +10721,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Atualizar a página de ajuda atual" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Ir para página anterior" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Ir para próxima página" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Ir para página inicial da ajuda do JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Aviso: localização ruim no documento HTML. A exceção foi: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Falha ao abrir página de ajuda. O URL de destino está vazio." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Falha ao abrir página de ajuda." @@ -10852,4 +10866,8 @@ msgid "Relation {0}" msgstr "Relação {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objeto" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10975,5 +10993,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Conflitos detectados" @@ -11673,14 +11691,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Aviso: primitiva \"{0}\" já está excluída do servidor. Ignorando esta " -"primitiva e repetindo o upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e " +"tentando novamente o envio de dados." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Preparando para enviar primitivos ..." @@ -11837,15 +11857,4 @@ msgstr "Conjunto de modificações está cheio" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e " -"tentando novamente o envio de dados." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11855,5 +11864,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -12064,4 +12073,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12143,5 +12153,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12364,23 +12374,23 @@ msgstr "ERRO" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Camada de dados {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "fora da área baixada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "versão {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12389,11 +12399,11 @@ msgstr[1] "Houve {0} conflitos detectados." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Clique para fechar essa janela e continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12402,32 +12412,32 @@ msgstr[1] "{0} removidos" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} consiste em:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "remover definição" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Versão API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Converter para camada GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Teste de consistência de dados" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Nenhum problema encontrado" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Foi encontrado os seguintes problemas:" @@ -13179,6 +13189,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13202,7 +13212,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13218,5 +13228,5 @@ msgstr "Padrão de traço ilegal, pelo menos um valor deve ser > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -14233,4 +14243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Nenhum" @@ -14347,15 +14358,13 @@ msgstr "Desenhar rápido (vai parecer feio)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Somente sugestões de sentido interessantes (ex. tag de mão única)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Somente no sentido da via." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14517,15 +14526,20 @@ msgstr "Pontos GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Desenhar sugestões de direção para os segmentos de trilha." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -14534,10 +14548,10 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Desenhar os limites dos dados carregados do servidor." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14545,9 +14559,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Desenhar as camadas de dados inativas em uma cor diferente." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14557,5 +14571,5 @@ "estilo selecionado." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Dados OSM" @@ -15897,4 +15911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Validar" @@ -16547,7 +16562,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "O servidor respondeu com um código de resposta 404, tentando novamente com " @@ -16603,9 +16619,9 @@ msgstr "Preferências \"{0}\" faltando. Não é possível inicializar OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Esta versão do JOSM é incompatível com o servidor configurado." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16616,21 +16632,21 @@ "{0} para {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16638,69 +16654,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Criando conjunto de modificações..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Aberto com sucesso o conjunto de modificações {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Esperava-se um ID de conjunto de modificações > 0. Recebi {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Atualizando conjunto de modificações..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Atualizando conjunto de modificações {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Fechando conjunto de mudanças..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Preparando requisição de envio..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Esperando 10 segundos ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - tentando de novo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -18298,5 +18314,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -20227,5 +20243,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -20480,4 +20496,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21168,5 +21185,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -21270,4 +21287,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21461,22 +21482,22 @@ msgstr "Executável do Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "Erro de transformação: Min X deve ser menor que max" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "Erro de transformação: Min Y deve ser menor que max" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "Erro de transformação: Pontos muito perto" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Erro de transformação: Variante sem suporte." -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Erro de transformação: Orientação sem suporte" @@ -22117,4 +22138,14 @@ msgid "Waypoints" msgstr "Pontos da via" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Editor de relações: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23257,4 +23288,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -23444,11 +23531,4 @@ "cannot apply your changes and continue editing.

    Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." msgstr "" @@ -25024,6 +25104,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25033,15 +25118,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importar problemas do OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25049,5 +25134,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25055,10 +25140,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25069,5 +25154,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25078,15 +25163,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "O grande pacote de itens de aparência JGoodies Plastic." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25094,20 +25179,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -25117,5 +25202,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -25124,15 +25209,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Possibilita capacidade de roteamento." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25142,20 +25227,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25165,15 +25250,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25182,5 +25267,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25189,10 +25274,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25203,15 +25294,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25221,5 +25312,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25228,20 +25319,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40663,4 +40754,348 @@ msgstr "Testar..." +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "nome de rua abreviado" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "Tag de sentido único em um nó" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "tag de ponte em um nó" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "tag de rodovia em um nó" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Estrada não classificada sem nome" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "Autoestrada se referência" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "tipo de rodovia temporária" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "valor incorreto" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "Ciclovia com tag bicicleta" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "Barreira usada em um caminho" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "velocidade máxima usada para via de pedestres" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "tag de layer com sinal +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "Nome de rua contém ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relação sem tipo" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurante sem nome" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "Combinação de tags não ususal" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "Mapas NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "Mapas NPE (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japão (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japão (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT japão (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Itália" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicília - Itália" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "Para {0} primitiva" +#~ msgstr[1] "Para {0} primitivas" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Recuperar {0} primitiva" +#~ msgstr[1] "Recuperar {0} primitivas" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
    ''{1}''." +#~ "
    Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "A camada \"{0}\" já tem um conflito para a primitiva
    \"{1}\"." +#~ "
    Por favor, primeiro resolva esse conflito e então tente de novo." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Aviso: primitiva \"{0}\" já está excluída do servidor. Ignorando esta " +#~ "primitiva e repetindo o upload." + #~ msgid "Update Plugins" #~ msgstr "Atualizar Plugins" @@ -41168,12 +41603,6 @@ #~ msgstr "Existiram conflitos durante a importação" -#~ msgid "Object" -#~ msgstr "Objeto" - #~ msgid "Members: {0}" #~ msgstr "Membros: {0}" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editor de relações: {0}" #~ msgid "" @@ -41365,40 +41794,4 @@ #~ msgstr "Nenhum dos nós destes caminhos está grudado a algo." -#~ msgid "NPE Maps" -#~ msgstr "Mapas NPE" - -#~ msgid "abbreviated street name" -#~ msgstr "nome de rua abreviado" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "Mapas NPE (Tim)" - -#~ msgid "relation without type" -#~ msgstr "relação sem tipo" - -#~ msgid "restaurant without name" -#~ msgstr "restaurante sem nome" - -#~ msgid "barrier used on a way" -#~ msgstr "Barreira usada em um caminho" - -#~ msgid "unusual tag combination" -#~ msgstr "Combinação de tags não ususal" - -#~ msgid "street name contains ss" -#~ msgstr "Nome de rua contém ss" - -#~ msgid "maxspeed used for footway" -#~ msgstr "velocidade máxima usada para via de pedestres" - -#~ msgid "highway without a reference" -#~ msgstr "Autoestrada se referência" - -#~ msgid "oneway tag on a node" -#~ msgstr "Tag de sentido único em um nó" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "Ciclovia com tag bicicleta" - #~ msgid "Email" #~ msgstr "Email" @@ -41447,10 +41840,4 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO! (WebKit GTK)" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" #~ msgid "YAHOO (WebKit)" @@ -42471,10 +42858,4 @@ #~ msgstr "A data no arquivo \"{0}\" não pode ser analisada." -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - #~ msgid "Conflict created" #~ msgstr "Conflito criado" @@ -42489,18 +42870,9 @@ #~ msgstr "parâmetro \"{0}\" não pode ser vazio" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Somente sugestões de sentido interessantes (ex. tag de mão única)" + #~ msgid "start" #~ msgstr "iniciar" - -#~ msgid "bridge tag on a node" -#~ msgstr "tag de ponte em um nó" - -#~ msgid "misspelled key name" -#~ msgstr "valor incorreto" - -#~ msgid "temporary highway type" -#~ msgstr "tipo de rodovia temporária" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "tag de rodovia em um nó" #~ msgid "Edit Station" @@ -42624,7 +42996,4 @@ #~ msgid "GPS unit timezone (difference to photo)" #~ msgstr "Zona horária do GPS (diferença com foto)" - -#~ msgid "layer tag with + sign" -#~ msgstr "tag de layer com sinal +" #~ msgid "layer not in list." @@ -43148,4 +43517,7 @@ #~ msgstr "A string ''{0}'' não é um valor double válido." +#~ msgid "Click do download the currently selected area" +#~ msgstr "Clique para baixar a área selecionada atualmente" + #~ msgctxt "changeset.open" #~ msgid "Open" @@ -43165,22 +43537,4 @@ #~ msgid "No, don't apply" #~ msgstr "Não, não aplique" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japão (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japão (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT japão (ORTHO02)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Itália" #~ msgid "Illegal upload comment" @@ -43485,6 +43839,17 @@ #~ msgstr "Baixar imagens WMS do {0}" -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Estrada não classificada sem nome" +#~ msgid "" +#~ "The child relation
    {0}
    is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "A relação filha
    {0}
    foi deletada no servidor. Ela não pode " +#~ "ser carregada." + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Nem {0} nem {1} estão ativos." +#~ "
    Por favor, escolha baixar dados do OSM, ou dados GPX ou ambos." #~ msgid "Join Areas: Remove Short Ways" @@ -43511,4 +43876,21 @@ #~ msgid "" +#~ "

    Help content for help topic missing

    Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

    " +#~ msgstr "" +#~ "

    Conteúdo de ajuda para o tópico não " +#~ "existe

    O conteúdo do tópico de ajuda " +#~ "{0} ainda não está disponível. Ele está faltando tanto na sua " +#~ "língua local ({1}) como em inglês.

    Por favor ajude a melhorar o " +#~ "sistema de ajuda do JOSM inserindo a informação que está faltando. Você " +#~ "pode tanto editar o tópico de ajuda no seu idioma ({1}) ou o tópico de ajudo em inglês.

    " + +#~ msgid "" #~ "To keep your local version, JOSM
    has to reset the id of " #~ "primitive {0} to 0.
    On the next upload the server will assign
    it a " @@ -43560,9 +43942,9 @@ #~ msgstr "Adicione um nome de arquivo ou um URL de um estilo ativo" -#~ msgid "Sicily - Italy" -#~ msgstr "Sicília - Itália" - #~ msgid "Projection ''{0}'' not found" #~ msgstr "Projeção \"{0}\" não encontrada" + +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Iniciar navegador com a ajuda do wiki para objetos selecionados" #~ msgid "import data from URL" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 25650) +++ /applications/editors/josm/i18n/po/ru.po (revision 25651) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-05 20:39+0000\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-17 09:53+0000\n" "Last-Translator: Sergey Astakhov \n" "Language-Team: Koptev Oleg \n" @@ -17,6 +17,6 @@ "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: 2011-03-06 15:19+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:16+0000\n" +"X-Generator: Launchpad (build 12617)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Language: Russian\n" @@ -24,10 +24,10 @@ #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -37,12 +37,12 @@ msgstr "Справка" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Некорректный файловый URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -78,7 +78,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -111,15 +111,15 @@ msgstr "Предупреждение" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" "Параметр \"downloadgps\" не может использовать имена файлов или файловые URL" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Некорректный URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -132,13 +132,13 @@ "раннюю версию JOSM (совместимую с Java 5).Больше информации:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Выйти из JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Все равно продолжить" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -159,4 +159,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -198,18 +199,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -228,4 +229,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "О программе" @@ -312,8 +315,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: неожиданный формат адреса базы API. Перенаправление на " @@ -418,4 +421,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -502,5 +506,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -589,6 +593,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -632,51 +636,51 @@ msgstr "Выделите не менее трёх точек." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "данных" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "слоя" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "выделения" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "конфликта" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "скачанного" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "предыдущего" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "следующего" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Ничего не выделено для масштабирования." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Масштабировать до {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Приблизить вид до {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -686,5 +690,5 @@ msgstr "Вид: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Нет конфликтов чтобы их приблизить" @@ -987,9 +991,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Скачать элементы, ссылающиеся на один из выделенных элементов" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -998,5 +1003,5 @@ msgstr "Дублировать" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Создать копию выделения копированием и вставкой." @@ -1104,5 +1109,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1486,5 +1491,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Объедините выбранные элементы в другой слой" @@ -1770,8 +1776,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "В скопированных данных присутствуют неполные элементы. После вставки, " @@ -1798,10 +1805,10 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "для элемента {0}" -msgstr[1] "для элементов {0}" -msgstr[2] "для элементов {0}" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Удалить {0} объект" +msgstr[1] "Удалить {0} объекта" +msgstr[2] "Удалить {0} объектов" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1921,4 +1928,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2891,5 +2899,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2897,4 +2905,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3541,7 +3550,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3555,8 +3564,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Предупреждение: Слой ''{0}'' больше не существует. Невозможно удалить " @@ -3781,10 +3790,10 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Восстановить {0} элемент" -msgstr[1] "Восстановить {0} элемента" -msgstr[2] "Восстановить {0} элементов" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Удалить {0} объект" +msgstr[1] "Удалить {0} объекта" +msgstr[2] "Удалить {0} объектов" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4102,5 +4111,5 @@ msgstr "Не в кеше" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4165,8 +4174,9 @@ msgstr "Отсутствует результат слияния типа {0} с id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4329,5 +4339,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "фон" @@ -5044,5 +5054,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5056,4 +5066,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5561,6 +5572,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5680,5 +5691,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Снимок" @@ -5938,5 +5949,5 @@ "используется." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5944,10 +5955,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5955,5 +5966,5 @@ msgstr "Инструменты" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5961,5 +5972,5 @@ msgstr "Заготовки" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5970,5 +5981,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Аудио" @@ -6378,7 +6389,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "" "Следующие элементы не могут быть скопированы в место назначения " @@ -6386,5 +6398,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Объединение удалённых элементов не удалось" @@ -6664,8 +6677,10 @@ msgstr "Ссылаются:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(отсутствует)" @@ -6705,5 +6720,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Элемент" @@ -6942,6 +6956,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6953,5 +6967,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7159,5 +7173,4 @@ msgstr "Показать список всех действий (буфер отмены)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7168,5 +7181,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7174,7 +7187,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7205,9 +7219,9 @@ msgstr "Конфликты: не улаженных {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Устранить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7215,5 +7229,5 @@ "объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7812,11 +7826,11 @@ msgstr "Нажимте для уменьшения/увеличения содержимого панели" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Авторы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Показать список людей, работающих с выделенными объектами." @@ -7831,5 +7845,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Выбрать элементы, созданные этим пользователем" @@ -7904,4 +7919,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Исправить" @@ -8126,5 +8142,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Скачать и показать историю выбранных элементов" @@ -8168,5 +8185,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Приблизиться к соответствующим элементам в текущем слое данных" @@ -9303,6 +9321,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9821,6 +9840,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Запустите браузер с Вики помощью по выделенному объекту" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9876,7 +9895,6 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Дочерний элемент
    {0}
    удален с сервера. Он не может быть загружен" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9975,8 +9993,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" @@ -9986,5 +10004,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Несколько участников, относящихся к одному и тому же элементу" @@ -10001,6 +10020,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Добавить все элементы, выделенные в текущем наборе данных, перед первым " @@ -10008,6 +10027,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Добавить все элементы, выделенные в текущем наборе данных, после последнего " @@ -10015,6 +10034,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -10023,6 +10043,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -10031,5 +10052,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Удалить всех участников, относящихся к каждому из выделенных элементов" @@ -10041,13 +10063,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "Выделить участников отношения, которые относятся к выбранным элементам" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Выделить участников отношения, которые относятся к {0} элем. среди " @@ -10055,5 +10076,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Выделить элементы для выделенных участников отношения" @@ -10154,11 +10176,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." -msgstr "" -"В слое ''{0}'' уже есть конфликт для элемента
    ''{1}''." -"
    Пожалуйста, уладьте этот конфликт, прежде чем продолжать." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." +msgstr "" +"В слое ''{0}'' уже есть конфликт для объекта
    ''{1}''." +"
    Пожалуйста, сначала уладьте этот конфликт, затем попытайтесь снова." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -10208,7 +10232,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Вы назначили пустую роль на {0} элемент." msgstr[1] "Вы назначили пустую роль на {0} элемента." @@ -10216,5 +10240,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Это эквивалентно удалению ролей из этих элементов." @@ -10509,6 +10534,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Нажмите, чтобы скачать с сервера выделенную область" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10520,9 +10545,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Ни {0} ни {1} не назначено." -"
    Пожалуйста выберите, скачать только данные OSM с сервера, или только " -"данные GPX, или и то и другое." +"
    Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10605,4 +10627,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10687,5 +10710,6 @@ msgstr "Браузер справки JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10693,18 +10717,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -"

    Отсутствует содержимое раздела справки

    Содержимое справки для раздела справки " -"{0} ещё не написано. И ({1}), и английский вариант пока отсутствуют." -"

    Пожалуйста, помогите улучшить справочную систему JOSM и заполните " -"отсутствующую информацию. Вы можете отредактировать справочный раздел     , на вашем ({1}) языке и - раздел на " -"английском.

    " - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10719,5 +10736,5 @@ "
    {1}

    " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10729,19 +10746,19 @@ "интернет" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Не удалось открыть ссылку" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Открыть текущую страницу справки во внешнем браузере" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Править текущую страницу справки" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10753,24 +10770,24 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Скачать заново текущую страницу справки" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Перейти на предыдущую страницу" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Перейти на следующую страницу" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Перейти на начальную страницу справки JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" @@ -10778,9 +10795,9 @@ "Предупреждение: плохое расположение в документе HTML. Текст ошибки: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Не удалось открыть справочную страницу. Ссылка пуста." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Не удалось открыть справочную страницу" @@ -10896,4 +10913,8 @@ msgid "Relation {0}" msgstr "Отношение {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Объект" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -11021,5 +11042,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Обнаружены конфликты" @@ -11744,14 +11765,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка на " -"сервер будет произведена без этого элемента." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Предупреждение: объект ''{0}'' уже удалён на сервере. Данные будут переданы " +"снова на сервер, но без этого объекта." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Подготовка элементов к загрузке на сервер ..." @@ -11920,15 +11943,4 @@ msgstr "Пакет правок заполнен" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Предупреждение: объект ''{0}'' уже удалён на сервере. Данные будут переданы " -"снова на сервер, но без этого объекта." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11939,5 +11951,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -12152,4 +12164,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12234,5 +12247,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12456,24 +12469,24 @@ msgstr "Ошибка" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Слой данных {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12483,11 +12496,11 @@ msgstr[2] "Обнаружено {0} конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12497,32 +12510,32 @@ msgstr[2] "{0} удалено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Тест согласованности набора данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Проблемы не обнаружены" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Обнаружены следующие проблемы:" @@ -13288,6 +13301,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13320,7 +13333,7 @@ "\"Информация\" из контекстного меню." -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13338,5 +13351,5 @@ "быть > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -14350,4 +14363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Нет" @@ -14468,17 +14482,13 @@ msgstr "Быстрая отрисовка (выглядит хуже)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" -"Показывать только полезные подсказки направления (например - с тегом дороги " -"с односторонним движением)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Только в начале пути" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14636,34 +14646,39 @@ msgstr "Точки GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Показывать направление на сегментах путей." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Показывать порядковые номера на всех сегментах линии." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Применить сглаживание карты." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Отображать границы области, скачанной с сервера." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Отображать неактивные слои данных другим цветом." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14671,5 +14686,5 @@ msgstr "Эта опция блокирует заполнение областей, несмотря на выбранный стиль." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Данные OSM" @@ -16025,4 +16040,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Проверить" @@ -16696,7 +16712,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Сервер выдал ошибку 404, повторная попытка будет с индивидуальным запросом " @@ -16753,9 +16770,9 @@ msgstr "Отсутствует настройка ''{0}''. Невозможно инициализировать OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Эта версия JOSM несовместима с настроенным сервером." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16766,21 +16783,21 @@ "поддерживает {0} до {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Соединение с {0} установлено используя протокол {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "Слой {0} удалён, т.к. запрещён к использованию." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16790,69 +16807,69 @@ "\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Создание пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Пакет правок {0} успешно открыт" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "требуется идентификатор пакета правок > 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Обновление пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Обновление пакета правок {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Закрытие пакета правок..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Нет пакетов правок для загрузки отличий" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Подготовка запроса загрузки на сервер..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Ожидание 10 секунд ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Попытка {0} из {1} через {2} секунды..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - пробуем ещё раз." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Попытка {0} из {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Текущий пакет правок пуст. Невозможно загрузить данные." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "Требуется, чтобы ID текущего пакета правок был > 0. Текущий ID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -18596,5 +18613,5 @@ msgstr "Ошибка в строке " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "Потерян аудио файл" @@ -20647,5 +20664,5 @@ msgstr "Левый клик: на точке для выбора; Тащить: тащить отрезок линии" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "Объединение контура" @@ -20903,4 +20920,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21212,5 +21230,5 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "Create" -msgstr "" +msgstr "Создать" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 @@ -21236,5 +21254,5 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 msgid "Search " -msgstr "" +msgstr "Найти " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 @@ -21612,5 +21630,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "Открыть MapDust" @@ -21716,4 +21734,8 @@ msgstr "Одна из выделенных линий уже является частью другого мультиполигона." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21918,5 +21940,5 @@ msgstr "исполняемый файл Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" @@ -21924,5 +21946,5 @@ "максимального" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" @@ -21930,14 +21952,14 @@ "максимального" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "Ошибка преобразования: точки находятся близко друг от друга" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Ошибка преобразования: Неподдерживаемый вариант." -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Ошибка преобразования: Неподдерживаемая ориентация" @@ -22578,4 +22600,14 @@ msgid "Waypoints" msgstr "Точки на дорогах" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Редактор отношений: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23750,4 +23782,60 @@ msgid "Create a new signing key" msgstr "Создать новый ключ подписи" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 @@ -23972,14 +24060,4 @@ "

    Вы согласны создать конфликт и закрыть редактор?" -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." -msgstr "" -"В слое ''{0}'' уже есть конфликт для объекта
    ''{1}''." -"
    Пожалуйста, сначала уладьте этот конфликт, затем попытайтесь снова." - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -25635,6 +25713,11 @@ msgstr "Просто преобразовать область в мультиполигон." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25647,15 +25730,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "Расширенные настройки для правки opening_hours" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Импорт вопросов из OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25665,5 +25748,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25673,10 +25756,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "Импортировать файл PDF и конвертировать в линии." #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25687,5 +25770,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25696,15 +25779,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Великолепный JGoodies Пластиковый Скин." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "добавляет проекции из Proj4J" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25714,20 +25797,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "Добавляет в меню Файл пункт "Перезапустить JOSM"" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Модуль для отката пакетов правок" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "Позволяет использовать изображения rgis.spb.ru в качестве подложки" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -25740,5 +25823,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -25749,15 +25832,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Предоставляет возможности маршрутизации." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "Позволяет запускать скрипты в JOSM." #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25770,20 +25853,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "Создание и правка карт морей для OpenSeaMap" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволяет добавлять метки/точки в текущей GPS позиции." #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показывает окно для редактирования тегов в табличной сетке." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25796,10 +25879,10 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Сделать ряд домов вдоль улицы из одного блока." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" @@ -25807,5 +25890,5 @@ #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25817,5 +25900,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25826,10 +25909,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "Модуль для цифровой подписи данных OSM" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25840,15 +25929,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "Несколько утилит, упрощающих жизнь." #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25861,5 +25950,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25870,20 +25959,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Быстрое скачивание вдоль большого набора связанных линий" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "Поиск по путевым точкам, импортированным из файлов gpx." #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "Выделить последовательность неветвящихся соединённых линий" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -36353,5 +36442,5 @@ #: build/trans_presets.java:3250 msgid "Deli (Fine Food)" -msgstr "Гастроном" +msgstr "Деликатесы" #. @@ -36359,5 +36448,5 @@ #: build/trans_presets.java:3252 msgid "Edit Deli (Fine Food)" -msgstr "Редактировать Гастроном" +msgstr "Свойства магазина деликатесов" #. item "Shops/Food/Confectionery" @@ -36505,5 +36594,5 @@ #: build/trans_presets.java:3362 msgid "Fabric" -msgstr "Фабрика" +msgstr "Ткани" #. @@ -36511,5 +36600,5 @@ #: build/trans_presets.java:3364 msgid "Edit Fabric" -msgstr "Редактировать Фабрику" +msgstr "Свойства магазина тканей" #. group "Electronic" @@ -41323,4 +41412,350 @@ msgstr "Тест" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "сокращённое название улицы" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "тег oneway на точке" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "тег bridge на точке" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "неверный тег highway на точке" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Безымянная дорога низкого класса" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "дорога без классификации" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "временная дорога" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "опечатка в названии ключа" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "велодорожка с тегом bicycle" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "пешеходная дорожка с тегом foot" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "отдельная полоса для велосипедов (велодорожка)" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "на линии находится заграждение для велосипедов" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "" +"для пешеходной дороги установлена максимальная скорость движения транспорта" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "тег слоя со знаком +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "название улицы содержит ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "Отношение без типа" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "ресторан без имени" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "необычная комбинация тегов" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Подложка Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (зеркало)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Подложка Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Подложка Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Улицы NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "карты NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Карты (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "Японский MLIT (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "Японский MLIT (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "Японский MLIT (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "Японский MLIT (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Италия" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicily - Италия" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 — Италия" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps (Франция)" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "для элемента {0}" +#~ msgstr[1] "для элементов {0}" +#~ msgstr[2] "для элементов {0}" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Восстановить {0} элемент" +#~ msgstr[1] "Восстановить {0} элемента" +#~ msgstr[2] "Восстановить {0} элементов" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
    ''{1}''." +#~ "
    Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "В слое ''{0}'' уже есть конфликт для элемента
    ''{1}''." +#~ "
    Пожалуйста, уладьте этот конфликт, прежде чем продолжать." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка " +#~ "на сервер будет произведена без этого элемента." + #~ msgid "No data imported." #~ msgstr "Данные не импортированы" @@ -41494,7 +41929,4 @@ #~ msgid "Click Reload to refresh list" #~ msgstr "Нажмите \"Обновить\" для обновления списка" - -#~ msgid "Object" -#~ msgstr "Объект" #~ msgid "Not implemented yet." @@ -41762,13 +42194,4 @@ #~ msgid "rugby" #~ msgstr "рэгби" - -#~ msgid "misspelled key name" -#~ msgstr "опечатка в названии ключа" - -#~ msgid "abbreviated street name" -#~ msgstr "сокращённое название улицы" - -#~ msgid "street name contains ss" -#~ msgstr "название улицы содержит ss" #~ msgid "Select, move and rotate objects" @@ -42117,7 +42540,4 @@ #~ msgid "unitarianist" #~ msgstr "унитаризм" - -#~ msgid "NPE Maps" -#~ msgstr "карты NPE" #~ msgid "Oberpfalz Geofabrik.de" @@ -42646,7 +43066,4 @@ #~ msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})" -#~ msgid "Relation Editor: {0}" -#~ msgstr "Редактор отношений: {0}" - #~ msgid "Solve Conflict" #~ msgstr "Разрешить конфликт" @@ -42733,10 +43150,4 @@ #~ msgid "YAHOO (GNOME Fix)" #~ msgstr "YAHOO (GNOME Fix)" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Карты (Tim)" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Улицы NRW Geofabrik.de" #~ msgid "The projection could not be read from preferences. Using EPSG:4326" @@ -43699,15 +44110,6 @@ #~ "найдены." -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" #~ msgid "Do you really want to delete layer ''{0}''?" @@ -44517,10 +44919,4 @@ #~ msgstr "UTM20N Guadeloupe Ste-Anne 1948" -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - #~ msgid "Man-Made" #~ msgstr "Рукотворное" @@ -44670,30 +45066,4 @@ #~ msgid "Bridleway" #~ msgstr "Дорога для верховой езды" - -#~ msgid "highway without a reference" -#~ msgstr "дорога без классификации" - -#~ msgid "temporary highway type" -#~ msgstr "временная дорога" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Безымянная дорога низкого класса" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "велодорожка с тегом bicycle" - -#~ msgid "footway with tag foot" -#~ msgstr "пешеходная дорожка с тегом foot" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "отдельная полоса для велосипедов (велодорожка)" - -#~ msgid "barrier used on a way" -#~ msgstr "на линии находится заграждение для велосипедов" - -#~ msgid "maxspeed used for footway" -#~ msgstr "" -#~ "для пешеходной дороги установлена максимальная скорость движения " -#~ "транспорта" #~ msgid "" @@ -45004,7 +45374,4 @@ #~ msgstr "Ошибка! Возможно отсутствуют теги." -#~ msgid "unusual tag combination" -#~ msgstr "необычная комбинация тегов" - #~ msgid "multipolygon way ''{0}'' is not closed." #~ msgstr "область с вложениями ''{0}'' не замкнута" @@ -45098,16 +45465,4 @@ #~ "check the servers address ''{1}'' for typos." -#~ msgid "restaurant without name" -#~ msgstr "ресторан без имени" - -#~ msgid "bridge tag on a node" -#~ msgstr "тег bridge на точке" - -#~ msgid "oneway tag on a node" -#~ msgstr "тег oneway на точке" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "неверный тег highway на точке" - #~ msgid "Delete the selected layer." #~ msgstr "Удалить выделенный слой." @@ -45156,7 +45511,4 @@ #~ msgstr "Надено {0} совпадений из {1} в GPX треке {2}" -#~ msgid "Landsat" -#~ msgstr "Подложка Landsat" - #~ msgid "help" #~ msgstr "Справка" @@ -45192,7 +45544,4 @@ #~ msgid "Unknown member type for ''{0}''." #~ msgstr "Неизвестный тип участника для «{0}»." - -#~ msgid "relation without type" -#~ msgstr "Отношение без типа" #~ msgid "No type found. History is empty." @@ -45488,4 +45837,15 @@ #~ msgstr "Строка ''{0}'' не является правильным двойным значением." +#~ msgid "Click do download the currently selected area" +#~ msgstr "Нажмите, чтобы скачать с сервера выделенную область" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Ни {0} ни {1} не назначено." +#~ "
    Пожалуйста выберите, скачать только данные OSM с сервера, или только " +#~ "данные GPX, или и то и другое." + #~ msgid "Available styles (from {0})" #~ msgstr "Доступные стили (из {0})" @@ -45535,4 +45895,9 @@ #~ msgstr "Теги ({0} конфликтов)" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "" +#~ "Показывать только полезные подсказки направления (например - с тегом " +#~ "дороги с односторонним движением)." + #~ msgid "Not yet tagged images" #~ msgstr "Картинки без тегов" @@ -45555,7 +45920,4 @@ #~ "предлагает исправить некоторые известные общие проблемы. Проверяет " #~ "правописание имён тегов." - -#~ msgid "layer tag with + sign" -#~ msgstr "тег слоя со знаком +" #~ msgid "An empty value deletes the key." @@ -45648,25 +46010,4 @@ #~ msgid "Downloading relation ''{0}''" #~ msgstr "Скачивание отношения ''{0}'' с сервера" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "Японский MLIT (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "Японский MLIT (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "Японский MLIT (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "Японский MLIT (ORTHO03)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Италия" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicily - Италия" #~ msgid "Please enter a latitude in the range -90..90" @@ -46015,10 +46356,4 @@ #~ msgstr "Удаление неподдерживаемых модулей..." -#~ msgid "Open Aerial Map" -#~ msgstr "Подложка Aerial Map" - -#~ msgid "Yahoo Sat" -#~ msgstr "Подложка Yahoo Sat" - #~ msgid "" #~ "The current value isn't a valid user ID. Please enter an integer value > 0" @@ -46397,4 +46732,11 @@ #~ "strong>
    Если же нажать на {1}, то вы вернётесь к " #~ "улаживанию конфликтов." + +#~ msgid "" +#~ "The child relation
    {0}
    is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Дочерний элемент
    {0}
    удален с сервера. Он не может быть " +#~ "загружен" #~ msgid "" @@ -46550,4 +46892,21 @@ #~ msgid "" +#~ "

    Help content for help topic missing

    Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

    " +#~ msgstr "" +#~ "

    Отсутствует содержимое раздела справки

    Содержимое справки для раздела справки " +#~ "{0} ещё не написано. И ({1}), и английский вариант пока " +#~ "отсутствуют.

    Пожалуйста, помогите улучшить справочную систему JOSM " +#~ "и заполните отсутствующую информацию. Вы можете отредактировать " +#~ "справочный раздел , на вашем ({1}) языке и - раздел на английском.

    " + +#~ msgid "" #~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}" #~ msgstr "" @@ -47051,10 +47410,4 @@ #~ msgstr "Редактировать OpenSeaMap" -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (зеркало)" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 — Италия" - #~ msgid "please enter GPS timecode" #~ msgstr "введите временную отсечку gps-трека" @@ -47075,9 +47428,9 @@ #~ msgstr "Масштаб слишком мелкий для сохранения точного смещения" -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps (Франция)" - #~ msgid "Add WMS URL" #~ msgstr "Добавить WMS ссылку" + +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Запустите браузер с Вики помощью по выделенному объекту" #~ msgid "Available styles (from {0}):" Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 25650) +++ /applications/editors/josm/i18n/po/sk.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-02-27 07:17+0000\n" "Last-Translator: Vlado \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:28+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:23+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Nápoveda" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorujem poškodený súbor z URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Upozornenie" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parameter \"downloadgps\" neakceptuje názov súboru, alebo URL súboru" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ignorujem nesprávnu URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -128,13 +128,13 @@ "staršie (Java 5 kompatibilnú) verziu JOSM. Viac informácií:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Ukončiť JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Pokračovať, pokúsiť sa znovu" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -155,4 +155,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -194,18 +195,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -224,4 +225,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "O programe" @@ -308,8 +311,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "VAROVANIE: neočakávaný formát z API bázy URL. Presmerovávanie na info, alebo " @@ -414,4 +417,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -496,5 +500,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -583,6 +587,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -625,51 +629,51 @@ msgstr "Vyberte prosím aspoň 3 body." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "údaje" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "vrstvu" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "výber" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "stiahnuté" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "predchádzajúce" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "nasledujúce" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Nie je zvolené nič, čo by se mohlo priblížiť." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Priblížiť na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Priblížiť pohľad na {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -679,5 +683,5 @@ msgstr "Zobrazenie: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť" @@ -979,9 +983,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Sťahovanie pôvodných odkazov do jedného vybraného pôvodného" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -990,5 +995,5 @@ msgstr "Duplikovať" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplikovať výber kopírovaním a vložením." @@ -1096,5 +1101,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1467,5 +1472,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Zlúčiť aktuálne vybrané pôvodné do inej vrstvy" @@ -1748,8 +1754,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Kopírované dáta obsahujú nekompletné pôvodné. Keď vložíte nekompletné " @@ -1775,10 +1782,10 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "až {0} pôvodné" -msgstr[1] "až {0} pôvodný" -msgstr[2] "až {0} pôvodných" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Zmazať {0} objekty" +msgstr[1] "Zmazať {0} objekt" +msgstr[2] "Zmazať {0} objektov" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1897,4 +1904,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2865,5 +2873,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2871,4 +2879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3502,7 +3511,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3516,8 +3525,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Varovanie: Vrstva ''{0}'' už viac neexistuje. Nemôžem odstrániť konflikt s " @@ -3741,10 +3750,10 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Obnovený {0} pôvodný" -msgstr[1] "Obnovené {0} pôvodné" -msgstr[2] "Obnovených {0} pôvodných" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Zmazať {0} objekty" +msgstr[1] "Zmazať {0} objekt" +msgstr[2] "Zmazať {0} objektov" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4063,5 +4072,5 @@ msgstr "Nie je v cache pamäti" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4124,8 +4133,9 @@ msgstr "Chýba zlúčujúci ciel typu {0} s id {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4288,5 +4298,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "pozadie" @@ -5002,5 +5012,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5014,4 +5024,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5515,6 +5526,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5634,5 +5645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Snímky" @@ -5887,5 +5898,5 @@ msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5893,10 +5904,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Zobraziť" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5904,5 +5915,5 @@ msgstr "Nástroje" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5910,5 +5921,5 @@ msgstr "Predvoľby" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5919,5 +5930,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Zvuk" @@ -6326,7 +6337,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "" "Nasledujúce pôvodné nemohli byť kopírované do cieľových pôvodných
    pretože " @@ -6334,5 +6346,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Spojenie vymazaných pôvodných neúspešné" @@ -6611,8 +6624,10 @@ msgstr "Odkazujúci na:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(žiadny)" @@ -6652,5 +6667,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Pôvodný" @@ -6886,6 +6900,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6897,5 +6911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7102,5 +7116,4 @@ msgstr "Otvorte prehľad všetkých príkazov (obnoviť vyrovnávaciu pamäť(buffer))" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7111,5 +7124,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7117,7 +7130,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7150,9 +7164,9 @@ msgstr "Konflikty: {0} nevyriešené" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Vyriešiť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7160,5 +7174,5 @@ "v obsahu na vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7759,11 +7773,11 @@ msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Autori (spracovatelia)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte" @@ -7778,5 +7792,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Výber pôvodných, doplnených týmto používateľom" @@ -7850,4 +7865,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Opraviť" @@ -8075,5 +8091,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Stiahnuť a zobraziť históriu vybratých pôvodných" @@ -8117,5 +8134,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Zväčšiť na zodpovedajúce pôvodné v aktuálnej dátovej vrstve" @@ -9253,6 +9271,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9767,6 +9786,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Spustiť prehliadač s wiki pomocníkom pre vybraný objekt" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9820,7 +9839,6 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" -msgstr "" -"odvodená relácia
    {0}
    je na servery zmazaná.Nemôže byť načítaná." +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9914,8 +9932,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" @@ -9925,5 +9943,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Viacnásobné členy odkazujú na rovnaké obecné" @@ -9939,18 +9958,19 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "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:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "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:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9959,6 +9979,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -9967,5 +9988,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných" @@ -9977,18 +9999,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects 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:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "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:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Výber pôvodných pre vybraté členy relácie" @@ -10088,11 +10110,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." -msgstr "" -"Vrstva ''{0}'' už mala konflikt pre pôvodné
    ''{1}''.
    Prosím " -"rozhodnite najskôr tento konflikt, potom skúste znovu." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." +msgstr "" +"Vrstva ''{0}'' už má konflikt na objekte
    ''{1}''.< br> Prosím " +"vyriešte najskôr tento konflikt, potom to skúste znova. " #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -10142,7 +10165,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Nastavili ste prázdnu funkciu na {0} pôvodnom." msgstr[1] "Nastavili ste prázdnu funkciu na {0} pôvodých." @@ -10150,5 +10173,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Toto sa rovná vymazaniu funkcií týchto pôvodných." @@ -10437,6 +10461,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Kliknutím stiahnete aktuálne vybratú oblasť" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10448,9 +10472,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Žiadny {0} ani {1} je umožnený." -"
    Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba." +"
    Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10533,4 +10554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10615,5 +10637,6 @@ msgstr "JOSM Help Browser" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10621,18 +10644,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -"

    Obsah pomoci pre chýbajúcu tému pomoci

    Obsah pomoci pre tému pomoci {0} nie je už dostupná. Je to chýbajúce v oboch vašich miestnych " -"jazykoch ({1}) a aj v angličtine.

    Pomôžte prosím pri zlepšení systému " -"pomoci JOSMu a doplňte chýbajúce informácie. Oboje môžete upraviť pre     tému pomoci vo vašom miestnom jazyku ({1}) a v táme pomoci v angličtine.

    " - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10647,5 +10663,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10657,19 +10673,19 @@ "internetové pripojenie" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Neúspešné otvorenie URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Otvoriť aktuálnu stránku pomoci v externom prehliadači" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Upraviť aktuálnu stránku pomoci" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10681,33 +10697,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Preložiť aktuálnu stránku pomoci" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Prejsť na predchádzajúcu stránku" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Prejsť na nasledujúcu stránku" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Choďte na JOSM domácu stránku pomoci" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Varovanie: zlé umiestnenie v HTML dokumente. Výnimka bola: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Neúspešné otvorenie stránky s pomocou. Cieľová URL je prázdna." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Neúspešné otvorenie stránky s pomocou" @@ -10821,4 +10837,8 @@ msgid "Relation {0}" msgstr "Relácia {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10945,5 +10965,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Objavené konflikty" @@ -11647,14 +11667,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto " -"pôvodných a zopakovanie nahratia." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Upozornenie: objekt ''{0}'' je už na servery zmazaný. Vynechávam tento " +"objekt a opakujem nahrávanie." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Pripravujem pôvodné na nahratie ..." @@ -11819,15 +11841,4 @@ msgstr "Zmenový súbor je plný" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Upozornenie: objekt ''{0}'' je už na servery zmazaný. Vynechávam tento " -"objekt a opakujem nahrávanie." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11836,5 +11847,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -12047,4 +12058,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12129,5 +12141,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12349,23 +12361,23 @@ msgstr "CHYBA" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Údajová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "mimo ukladanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "verzia {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12375,11 +12387,11 @@ msgstr[2] "Bolo tam zistených {0} konfliktov." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Kliknutím zavriete tento dialóga pokračujete v editovaní" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12389,32 +12401,32 @@ msgstr[2] "{0} vymazaných" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "neuršený (unset)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Verzia API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Previesť do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Test konzistencie dátovej sady" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Nezistený žiadny problém" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Bol najdený nasledujúci problém:" @@ -13178,6 +13190,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13203,7 +13215,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13220,5 +13232,5 @@ msgstr "Nesprávna kresba prerušovanej čiary, aspoň jedna hodnota musí byť > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -14224,4 +14236,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Žiadny" @@ -14338,15 +14351,13 @@ msgstr "Rýchle vykresľovanie (vypadá nepekne)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Iba dôležité smery (napr. jednosmerka)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Iba na začiatku cesty." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14508,15 +14519,20 @@ msgstr "GPS body" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Kresliť smer cestného segmentu" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "" @@ -14524,19 +14540,19 @@ #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Zobrazovať hranice dát stiahnutých zo servera." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Zobrazovať neaktívne vrstvy dát inou farbou." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14544,5 +14560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM údaje" @@ -15875,4 +15891,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Overiť" @@ -16540,7 +16557,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Server odpovedal s chybovou kód 404, opakovanie s individuálnou žiadosťou " @@ -16597,5 +16615,5 @@ msgstr "Chýbajú preferencie ''{0}'. Nemôžem inicializovať OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" @@ -16603,5 +16621,5 @@ "nastaveniach." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16611,21 +16629,21 @@ "Podporuje protokol verzie 0.6, zatiaľ čo server uvádza podporu {0} do {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16635,69 +16653,69 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Vytváranie súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Úspešne otvorený súbor zmien {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Zmenový súbor id > 0 očekávaný. Got {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Aktualizácia súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Aktualizácia súboru zmien {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Zatváranie súboru zmien..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Nenachádza sa tu súbor zmien pre diff nahratie" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Pripravujem požiadavku pre nahrávanie ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Čakanie 10 sekúnd ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Začiatok opakovania {0} z {1} v {2} sekunde ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - skúšam znovu." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Spúšťam opakovanie {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Aktuálny zmenový súbor je prázdny. Nemožem nahrať dáta." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -18426,5 +18444,5 @@ msgstr "Chyba v riadku " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "Chýbajúci zvukový súbor" @@ -20395,5 +20413,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -20647,4 +20665,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21347,5 +21366,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -21450,4 +21469,8 @@ msgstr "Jedna z vybraných ciest už je súčasťou iného multipolygónu." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21649,22 +21672,22 @@ msgstr "Spúšťací súbor Firefoxu" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -22298,4 +22321,14 @@ msgid "Waypoints" msgstr "Cestné objekty" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Editor relácie: {0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23436,4 +23469,60 @@ #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:777 msgid "Create a new signing key" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." msgstr "" @@ -23654,13 +23743,4 @@ "editor? " -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." -msgstr "" -"Vrstva ''{0}'' už má konflikt na objekte
    ''{1}''.< br> Prosím " -"vyriešte najskôr tento konflikt, potom to skúste znova. " - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -25271,6 +25351,11 @@ msgstr "Jednoduché prevedenie oblasti na multipolygón." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25283,15 +25368,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Importuje vydania z OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25301,5 +25386,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25308,10 +25393,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25322,5 +25407,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25331,15 +25416,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Ohromný JGoodies Plastic Look and Feel." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25347,20 +25432,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -25370,5 +25455,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -25379,15 +25464,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Určuje trasové schopnosti" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25397,20 +25482,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 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:115 +#: build/trans_plugins.java:117 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:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25423,15 +25508,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Vytvára radové domy mimo jednotlivých blokov." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25440,5 +25525,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25449,10 +25534,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25461,15 +25552,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25479,5 +25570,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25488,5 +25579,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -25494,15 +25585,15 @@ #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 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:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40939,4 +41030,349 @@ msgstr "Otestovať" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "skrátené meno ulice" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "značka (tag) jednosmerky (oneway) na bode" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "značka (tag) mosta (bridge) na bode" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "chybná značka (tag) komunikácie na bode" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Nepomenovaná nezaradená(unclassified) hlavná cesta(highway)" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "komunikácia bez označenia (ref)" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "dočasný typ komunikácie" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "preklep v mene kľúča (key)" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "cesta pre bicykle so značkou bicykla" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "cesta pre peších so značkou" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "oddelené jazdné pruhy na ceste pre cyklistov" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "prekážka na ceste" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "maximálna rýchlosť na ceste pre peších" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "značka vrstvy so značkou +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "meno ulice obsahuje ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relácia bez type" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "reštaurácia bez mena" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "neobvyklá kombinácia značiek (tagov)" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Ulice NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Czech CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Czech UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT Japan (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT Japan (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT Japan (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT Japan (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Lodi - Italy" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicily - Italy" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "až {0} pôvodné" +#~ msgstr[1] "až {0} pôvodný" +#~ msgstr[2] "až {0} pôvodných" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Obnovený {0} pôvodný" +#~ msgstr[1] "Obnovené {0} pôvodné" +#~ msgstr[2] "Obnovených {0} pôvodných" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
    ''{1}''." +#~ "
    Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Vrstva ''{0}'' už mala konflikt pre pôvodné
    ''{1}''.
    Prosím " +#~ "rozhodnite najskôr tento konflikt, potom skúste znovu." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto " +#~ "pôvodných a zopakovanie nahratia." + #~ msgid "Move" #~ msgstr "Presunúť" @@ -40965,7 +41401,4 @@ #~ msgid "my version:" #~ msgstr "moja verzia:" - -#~ msgid "Object" -#~ msgstr "Objekt" #~ msgid "Unknown version" @@ -41710,13 +42143,4 @@ #~ msgstr "YAHOO (GNOME)" -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Maps" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - #~ msgid "YAHOO (WebKit)" #~ msgstr "YAHOO (WebKit)" @@ -41725,13 +42149,4 @@ #~ msgstr "YAHOO (GNOME Fix)" -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Maps (Tim)" - -#~ msgid "bridge tag on a node" -#~ msgstr "značka (tag) mosta (bridge) na bode" - -#~ msgid "oneway tag on a node" -#~ msgstr "značka (tag) jednosmerky (oneway) na bode" - #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" @@ -41739,31 +42154,4 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "misspelled key name" -#~ msgstr "preklep v mene kľúča (key)" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Ulice NRW Geofabrik.de" - -#~ msgid "barrier used on a way" -#~ msgstr "prekážka na ceste" - -#~ msgid "footway with tag foot" -#~ msgstr "cesta pre peších so značkou" - -#~ msgid "street name contains ss" -#~ msgstr "meno ulice obsahuje ss" - -#~ msgid "abbreviated street name" -#~ msgstr "skrátené meno ulice" - -#~ msgid "maxspeed used for footway" -#~ msgstr "maximálna rýchlosť na ceste pre peších" - -#~ msgid "restaurant without name" -#~ msgstr "reštaurácia bez mena" - -#~ msgid "unusual tag combination" -#~ msgstr "neobvyklá kombinácia značiek (tagov)" #~ msgid "Motorboat" @@ -42224,13 +42612,4 @@ #~ msgid "optician" #~ msgstr "Očná optika" - -#~ msgid "highway without a reference" -#~ msgstr "komunikácia bez označenia (ref)" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "chybná značka (tag) komunikácie na bode" - -#~ msgid "temporary highway type" -#~ msgstr "dočasný typ komunikácie" #~ msgid "Slippy Map" @@ -42514,7 +42893,4 @@ #~ "Lambert zóna {0} v cache je nekompatibilná s aktuálnou Lambert zónou {1}" -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "oddelené jazdné pruhy na ceste pre cyklistov" - #~ msgid "Save and Exit" #~ msgstr "Uložiť a Ukončiť" @@ -42556,7 +42932,4 @@ #~ msgstr "Získať stopy budov" -#~ msgid "layer tag with + sign" -#~ msgstr "značka vrstvy so značkou +" - #~ msgid "Delete Layer" #~ msgstr "Vymazať vrstvu" @@ -42622,7 +42995,4 @@ #~ msgid "Move Down" #~ msgstr "Posunúť dole" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Editor relácie: {0}" #~ msgid "Move Up" @@ -43064,4 +43434,7 @@ #~ msgid "Upload to OSM..." #~ msgstr "Uložiť do OSM..." + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Iba dôležité smery (napr. jednosmerka)" #~ msgid "Contacting the OSM server..." @@ -44033,16 +44406,4 @@ #~ msgstr "Pridať nový XML zdroj do zoznamu." -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - #~ msgid "Remove relation member {0} {1}" #~ msgstr "Odstrániť člena relácie {0} {1}" @@ -44067,7 +44428,4 @@ #~ " Podržať pravé tlašítko myši a pohnúť myšou alebo použiť kurzorové " #~ "klávesy. Vybrať: Click." - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Nepomenovaná nezaradená(unclassified) hlavná cesta(highway)" #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" @@ -44972,10 +45330,4 @@ #~ msgstr "vytvoriť nové objekty" -#~ msgid "Czech CUZK:KM" -#~ msgstr "Czech CUZK:KM" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Czech UHUL:ORTOFOTO" - #~ msgid "type=route - key 'type' with value exactly 'route'." #~ msgstr "type=cesta - kľúč 'type' s presnou hodnotou 'cesta'." @@ -44990,7 +45342,4 @@ #~ msgid "Missing attribute ''type'' on member {0} in relation {1}" #~ msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}" - -#~ msgid "relation without type" -#~ msgstr "relácia bez type" #~ msgid "H" @@ -45522,7 +45871,4 @@ #~ msgstr "Prosí pozrite Conflict List Dialog
    a manuálne ho vyriešte." -#~ msgid "cycleway with tag bicycle" -#~ msgstr "cesta pre bicykle so značkou bicykla" - #~ msgid "Help / About" #~ msgstr "Nápoveda / o programe" @@ -45612,4 +45958,12 @@ #~ msgstr "" #~ "Neúspešné načítanie príkazu. Ukončujem prehliadač pre pomoc. Výnimka bola:" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Žiadny {0} ani {1} je umožnený." +#~ "
    Prosím vybrať pre jedny sťahované OSM dáta, alebo GPX dáta, alebo oba." +#~ "" #~ msgid "Available styles (from {0})" @@ -45672,4 +46026,7 @@ #~ "Click to to return to the relation editor and to resume relation editing" #~ msgstr "Kliknutie navráti editor relácie a pokračuje v editovaní relácie" + +#~ msgid "Click do download the currently selected area" +#~ msgstr "Kliknutím stiahnete aktuálne vybratú oblasť" #~ msgid "" @@ -45807,25 +46164,4 @@ #~ "byť vyradený.
    Zmazať z nastavení?" -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT Japan (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT Japan (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT Japan (ORTHO02)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Lodi - Italy" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicily - Italy" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT Japan (ORTHO03)" - #~ msgid "Please enter a latitude in the range -90..90" #~ msgstr "Prosím vložte zemepisnú šírku v rozsahu -90..90" @@ -46039,4 +46375,21 @@ #~ msgid "" +#~ "

    Help content for help topic missing

    Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

    " +#~ msgstr "" +#~ "

    Obsah pomoci pre chýbajúcu tému pomoci

    Obsah pomoci pre tému pomoci {0} nie je už dostupná. Je to chýbajúce v oboch vašich miestnych " +#~ "jazykoch ({1}) a aj v angličtine.

    Pomôžte prosím pri zlepšení " +#~ "systému pomoci JOSMu a doplňte chýbajúce informácie. Oboje môžete upraviť " +#~ "pre tému pomoci vo vašom miestnom jazyku ({1}) a v táme pomoci v angličtine.

    " + +#~ msgid "" #~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}" #~ msgstr "" @@ -46182,4 +46535,11 @@ #~ msgid "" +#~ "The child relation
    {0}
    is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "odvodená relácia
    {0}
    je na servery zmazaná.Nemôže byť " +#~ "načítaná." + +#~ msgid "" #~ "You are about to delete incomplete objects.
    This will cause problems " #~ "because you don't see the real object.
    Do you really want to delete?" @@ -46194,4 +46554,7 @@ #~ msgstr "Interné štýly" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Spustiť prehliadač s wiki pomocníkom pre vybraný objekt" + #~ msgid "Available styles (from {0}):" #~ msgstr "Dostupné štýly (od {0}):" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 25650) +++ /applications/editors/josm/i18n/po/sv.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-01-18 10:51+0000\n" "Last-Translator: Frank \"knarF\" M. Eriksson \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:13+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:14+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "Hjälp" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ignorerar ogiltig fil-URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "Varning" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Parametern \"downloadgps\" godtar inte filnamn eller fil URL:er." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Hoppar över felaktig URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -125,13 +125,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Avsluta JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Fortsätt, försök i alla fall" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -152,4 +152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -191,18 +192,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -221,4 +222,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Om programmet" @@ -305,8 +308,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "VARNING: felaktigt skriven URL till API:t. Länkar till info- och " @@ -410,4 +413,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -492,5 +496,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -579,6 +583,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -621,51 +625,51 @@ msgstr "Välj åtminstone tre noder." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "lager" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "urval" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "konflikt" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "nedhämtad data" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "föregående" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "nästa" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Det finns inte något valt att zooma till" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Zooma till {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Zooma det visade till {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -675,5 +679,5 @@ msgstr "Visa: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Det finns inte några konflikter att zooma till" @@ -977,9 +981,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Hämtar de primitiver som refererar till en av de valda primitiverna" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -988,5 +993,5 @@ msgstr "Duplicera" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Duplicera det valda genom att kopiera och omedelbart klistra in." @@ -1094,5 +1099,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1465,5 +1470,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Sammanfoga de markerade primitiva med ett annat lager" @@ -1742,8 +1748,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Det kopierade datat innehåller inkompletta primitiv. Vid inklistring kommer " @@ -1771,9 +1778,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "till {0} primitiva" -msgstr[1] "till {0} primitiva" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Ta bort {0} objekt" +msgstr[1] "Ta bort {0} objekt" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1891,4 +1898,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2841,5 +2849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2847,4 +2855,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3488,5 +3497,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3498,8 +3507,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Varning: Lagret ''{0}'' existerar Ej längre, Kan Ej lösa konflikten för " @@ -3713,9 +3722,9 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Ta bort {0} objekt" +msgstr[1] "Ta bort {0} objekt" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4018,5 +4027,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4076,8 +4085,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4233,5 +4243,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "bakgrund" @@ -4941,5 +4951,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4953,4 +4963,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5465,6 +5476,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5582,5 +5593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5833,5 +5844,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5839,10 +5850,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Visa" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5850,5 +5861,5 @@ msgstr "Verktyg" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5856,5 +5867,5 @@ msgstr "Snabbval" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5865,5 +5876,5 @@ msgstr "Meny: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Ljud" @@ -6253,11 +6264,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" -msgstr "" +#, fuzzy +msgid "Merging deleted objects failed" +msgstr "Kontrollerar föräldrar för raderade objekt" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 @@ -6511,8 +6523,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "" @@ -6552,5 +6566,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6786,6 +6799,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6796,5 +6809,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6990,5 +7003,4 @@ msgstr "Öppnar en lista över alla kommandon (ånger-buffer)" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6999,5 +7011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7005,7 +7017,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7036,14 +7049,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Jämka" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" "Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7623,11 +7636,11 @@ msgstr "Klicka för att minimera/maximera panelens innehåll" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Upphovsmän" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Öppna en lista över de som arbetar med de valda objekten." @@ -7641,5 +7654,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7707,4 +7720,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Rätta till" @@ -7930,6 +7944,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "ej angiven: ange inte denna egenskap för valda objekt" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7965,6 +7980,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" -msgstr "" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" +msgstr "Öppna listan över ändringsuppsättningar i nuvarande lager." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393 @@ -9096,8 +9112,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" -msgstr "" +msgstr "Öppna listan över ändringsuppsättningar i nuvarande lager." #. parent for dialog is Main.parent @@ -9569,5 +9586,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9621,5 +9638,5 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9709,10 +9726,10 @@ msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9726,16 +9743,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" +msgstr "" +"Uppdaterar valda ändringsuppsättningar med aktuella data från OSM-servern" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" -msgstr "" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" +msgstr "" +"Uppdaterar valda ändringsuppsättningar med aktuella data från OSM-servern" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9743,11 +9762,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 msgid "" -"Add all primitives selected in the current dataset after the last selected " +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Hämtar de primitiver som refererar till en av de valda primitiverna" #. putValue(NAME, tr("Remove Selected")); @@ -9758,6 +9778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9765,11 +9784,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Ta bort den valda relationen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9861,8 +9880,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." msgstr "" @@ -9914,11 +9934,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -10205,6 +10225,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Klicka för att hämta det för närvarande valda området" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10216,8 +10236,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Vare sig {0} eller {1} är aktiverat." -"
    Välj mellan att antingen hämta OSM-data, GPX-data eller bådadera." +"
    Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10300,4 +10318,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10382,5 +10401,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10388,11 +10408,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10403,5 +10423,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10410,19 +10430,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10432,33 +10452,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10570,4 +10590,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Objekt" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10688,5 +10712,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "" @@ -11329,13 +11353,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Förbereder data..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11466,13 +11492,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11481,5 +11498,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11672,4 +11689,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11751,5 +11769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11967,23 +11985,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Datalager {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "utanför hämtat område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11992,11 +12010,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12005,32 +12023,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12760,6 +12778,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12783,7 +12801,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12798,5 +12816,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13703,4 +13721,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Inget" @@ -13817,17 +13836,13 @@ msgstr "Snabb ritning (ser sämre ut)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" -"Enbart intressanta riktningsanvisningar (t ex i kombination med taggen " -"oneway - enkelriktat)" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Enbart på en sträckas huvud." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13988,25 +14003,30 @@ msgstr "GPS-punkter" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Rita riktningsanvisningar för delsträckor." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Använd antialiasing för att ge kartan ett jämnare utseende." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Rita gränser för data hämtade från servern." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14014,9 +14034,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Rita de inaktiva datalagren i avvikande färg." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14024,5 +14044,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM-data" @@ -15281,4 +15301,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Validera" @@ -15914,5 +15935,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15966,9 +15987,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15977,21 +15998,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15999,69 +16020,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Stänger ändringssamling..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17621,5 +17642,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19528,5 +19549,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19780,4 +19801,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20480,5 +20502,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20582,4 +20604,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20777,22 +20803,22 @@ msgstr "Firefox-applikationen" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21426,4 +21452,14 @@ msgid "Waypoints" msgstr "Vägpunkter" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Relationsredigerare:{0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22569,4 +22605,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22756,11 +22848,4 @@ "cannot apply your changes and continue editing.

    Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." msgstr "" @@ -24306,6 +24391,11 @@ msgstr "Konvertera enkelt en yta till en multipolygon." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24315,15 +24405,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24331,5 +24421,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24337,10 +24427,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24349,5 +24439,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24356,15 +24446,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24374,20 +24464,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24397,5 +24487,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24406,15 +24496,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24427,20 +24517,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24450,15 +24540,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24467,5 +24557,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24474,10 +24564,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24486,15 +24582,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24504,5 +24600,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24511,20 +24607,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Enkel hämtning längs med en lång kedja av sammanbundna sträckor" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39946,4 +40042,328 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "förkortat gatunamn" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "enkelriktningstagg på en nod" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "brotagg på en nod" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "enstaka nod felaktigt taggad som landsväg (highway)" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Onamnad oklassifierad landsväg (highway)" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "landsväg som saknar referens" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "tillfällig landsvägstyp" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "felstavat nyckelnamn" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "cykelstig med taggen cykel" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "gångstig med taggen fotgängare" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "separat cykelväg som fil på en cykelväg" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "hinder använt på en sträcka" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "maxhastighet använt på gångstig" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "lagertagg med plustecken" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "gatunamn innehåller ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "relation utan typ" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "restaurang utan namn" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "ovanlig kombination av taggar" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE-kartor" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE-kartor (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "till {0} primitiva" +#~ msgstr[1] "till {0} primitiva" + #~ msgid "Move" #~ msgstr "Flytta" @@ -39971,7 +40391,4 @@ #~ msgid "Unsaved Changes" #~ msgstr "Osparade ändringar" - -#~ msgid "Object" -#~ msgstr "Objekt" #~ msgid "Unknown version" @@ -40481,7 +40898,4 @@ #~ msgid "Illegal object with id=0" #~ msgstr "Ogiltigt objekt med id=0" - -#~ msgid "Preparing data..." -#~ msgstr "Förbereder data..." #~ msgid "" @@ -40647,4 +41061,9 @@ #~ msgstr "Rugby" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "" +#~ "Enbart intressanta riktningsanvisningar (t ex i kombination med taggen " +#~ "oneway - enkelriktat)" + #~ msgid "Preset group ''{0}''" #~ msgstr "Snabbvalsgrupp ''{0}''" @@ -40674,10 +41093,4 @@ #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" - -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "NPE Maps" -#~ msgstr "NPE-kartor" #~ msgid "YAHOO (WebKit)" @@ -41056,7 +41469,4 @@ #~ msgstr "WMS-url (Förval)" -#~ msgid "oneway tag on a node" -#~ msgstr "enkelriktningstagg på en nod" - #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" @@ -41064,40 +41474,4 @@ #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Open Aerial Map" -#~ msgstr "Open Aerial Map" - -#~ msgid "bridge tag on a node" -#~ msgstr "brotagg på en nod" - -#~ msgid "highway without a reference" -#~ msgstr "landsväg som saknar referens" - -#~ msgid "misspelled key name" -#~ msgstr "felstavat nyckelnamn" - -#~ msgid "temporary highway type" -#~ msgstr "tillfällig landsvägstyp" - -#~ msgid "barrier used on a way" -#~ msgstr "hinder använt på en sträcka" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "cykelstig med taggen cykel" - -#~ msgid "footway with tag foot" -#~ msgstr "gångstig med taggen fotgängare" - -#~ msgid "maxspeed used for footway" -#~ msgstr "maxhastighet använt på gångstig" - -#~ msgid "street name contains ss" -#~ msgstr "gatunamn innehåller ss" - -#~ msgid "abbreviated street name" -#~ msgstr "förkortat gatunamn" - -#~ msgid "layer tag with + sign" -#~ msgstr "lagertagg med plustecken" #~ msgid "Drawbridge" @@ -41305,7 +41679,4 @@ #~ "alla?" -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "separat cykelväg som fil på en cykelväg" - #~ msgid "" #~ "Server returned internal error. Try a reduced area or retry after waiting " @@ -41404,13 +41775,4 @@ #~ msgstr "Det fungerar tyvärr inte med anonyma användare" -#~ msgid "unusual tag combination" -#~ msgstr "ovanlig kombination av taggar" - -#~ msgid "relation without type" -#~ msgstr "relation utan typ" - -#~ msgid "restaurant without name" -#~ msgstr "restaurang utan namn" - #~ msgid "Replaces Selection with Users data" #~ msgstr "Ersätter urvalet med användarens data" @@ -41509,7 +41871,4 @@ #~ "projektion du använder för att bli av med detta varningsmeddelande." #~ "
    Vill du fortsätta?" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE-kartor (Tim)" #~ msgid "More than one \"to\" way found." @@ -41717,7 +42076,4 @@ #~ msgid "Move Down" #~ msgstr "Flytta nedåt" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "Relationsredigerare:{0}" #~ msgid "Move Up" @@ -42445,9 +42801,6 @@ #~ msgstr "Dubblera sträckor med förskjutning" -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Onamnad oklassifierad landsväg (highway)" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "enstaka nod felaktigt taggad som landsväg (highway)" +#~ msgid "Click do download the currently selected area" +#~ msgstr "Klicka för att hämta det för närvarande valda området" #~ msgid "Simplify Area (remove {0} node)" @@ -42455,2 +42808,10 @@ #~ msgstr[0] "Förenkla yta (ta bort {0} nod)" #~ msgstr[1] "Förenkla yta (ta bort {0} noder)" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Vare sig {0} eller {1} är " +#~ "aktiverat.
    Välj mellan att antingen hämta OSM-data, GPX-data eller " +#~ "bådadera." Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 25650) +++ /applications/editors/josm/i18n/po/tr.po (revision 25651) @@ -10,5 +10,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-02-10 16:51+0000\n" "Last-Translator: Bekir DURAK \n" @@ -18,15 +18,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:17+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:32+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -36,12 +36,12 @@ msgstr "Yardım" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "hatalı dosya atlandı URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -77,7 +77,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -110,5 +110,5 @@ msgstr "Uyarı" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" @@ -116,10 +116,10 @@ "etmemektedir." -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Yanlış linkler atlanıldı: URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -129,13 +129,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "JOSM'den çık" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -156,4 +156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -195,18 +196,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -225,4 +226,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Hakkında" @@ -312,5 +315,5 @@ msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" @@ -408,4 +411,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -488,5 +492,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -575,6 +579,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -617,51 +621,51 @@ msgstr "En azından üç nokta seçmen lazım" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "veri" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "tabaka" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "seleksiyon" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "çakışma" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "indir" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "önceki" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "sonraki" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Yakınlaştıracak bir şey yok." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "{0} kadar yakınlaştır" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Görünüm {0} kadar yakınlaştır {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -671,5 +675,5 @@ msgstr "Görüntü: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Yakınlaştıracak bir çakışma yok." @@ -971,9 +975,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#, fuzzy +msgid "Download objects referring to one of the selected objects" +msgstr "atanmamış: bu özelliği seçili objeye atamayın" + +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -982,5 +987,5 @@ msgstr "Çift" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Kopyala ve Yapştır ile seçimi çiftle." @@ -1088,5 +1093,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1439,6 +1444,7 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" -msgstr "" +#, fuzzy +msgid "Merge the currently selected objects into another layer" +msgstr "Varsayılan tabaka başka bir tabaka ile birleştir" #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 @@ -1700,7 +1706,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" @@ -1723,9 +1729,8 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "{0} Objeyi Değiştir" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1838,4 +1843,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2750,5 +2756,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2756,4 +2762,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3349,5 +3356,5 @@ #, java-format msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3362,5 +3369,5 @@ msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" @@ -3567,9 +3574,8 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "" -msgstr[1] "" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "{0} Objeyi Değiştir" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3867,5 +3873,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3923,8 +3929,9 @@ msgstr "" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4075,5 +4082,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "arkaplan" @@ -4776,5 +4783,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4788,4 +4795,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5284,6 +5292,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5399,5 +5407,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "" @@ -5643,5 +5651,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5649,10 +5657,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Görünüm" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5660,5 +5668,5 @@ msgstr "Araçlar" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5666,5 +5674,5 @@ msgstr "Ayarlanmış" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5675,5 +5683,5 @@ msgstr "Menu: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Ses" @@ -6061,10 +6069,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +msgid "Merging deleted objects failed" msgstr "" @@ -6319,8 +6327,10 @@ msgstr "" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "" @@ -6360,5 +6370,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "" @@ -6592,6 +6601,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6601,5 +6610,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6783,5 +6792,4 @@ msgstr "Bütün komutların listesini göster (Geri Al Alanı)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6792,5 +6800,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6798,7 +6806,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6829,13 +6838,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Çözümle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "Seçili nesneler için birleştime penceresi aç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7408,11 +7417,11 @@ msgstr "paneli büyütüp/küçültmek için tıklayınız" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Yazarlar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Seçili obje üzerinde çalışna kişilerin listesini göster." @@ -7426,5 +7435,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +msgid "Select objects submitted by this user" msgstr "" @@ -7492,4 +7501,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Onar" @@ -7711,6 +7721,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" -msgstr "" +#, fuzzy +msgid "Download and show the history of the selected objects" +msgstr "atanmamış: bu özelliği seçili objeye atamayın" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315 @@ -7746,5 +7757,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +msgid "Zoom to the corresponding objects in the current data layer" msgstr "" @@ -8878,5 +8889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9346,5 +9357,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" +msgid "Launch browser with wiki help for selected object" msgstr "" @@ -9398,5 +9409,5 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" +"loaded" msgstr "" @@ -9486,10 +9497,10 @@ msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +msgid "Multiple members referring to same object." msgstr "" @@ -9503,16 +9514,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +msgid "Add all objects selected in the current dataset before the first member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +msgid "Add all objects selected in the current dataset after the last member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "" -"Add all primitives selected in the current dataset before the first selected " +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9520,11 +9529,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 msgid "" -"Add all primitives selected in the current dataset after the last selected " +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" -msgstr "" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" +msgstr "Seçili obje üzerinde çalışna kişilerin listesini göster." #. putValue(NAME, tr("Remove Selected")); @@ -9535,6 +9545,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +msgid "Select relation members which refer to objects in the current selection" msgstr "" @@ -9542,11 +9551,11 @@ #, java-format msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +"Select relation members which refer to {0} objects in the current selection" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" -msgstr "" +#, fuzzy +msgid "Select objects for selected relation members" +msgstr "Seçili ilişkiyi sil" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 @@ -9638,8 +9647,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." msgstr "" @@ -9691,11 +9701,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 #, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "" -msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +msgid "This is equal to deleting the roles of these objects." msgstr "" @@ -9971,5 +9980,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" +msgid "Click to download the currently selected area" msgstr "" @@ -9982,5 +9991,5 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." +"
    Please choose to either download OSM data, or GPX data, or both." msgstr "" @@ -10064,4 +10073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10146,5 +10156,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10152,11 +10163,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10167,5 +10178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10174,19 +10185,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10196,33 +10207,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "" @@ -10334,4 +10345,8 @@ msgid "Relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Obje" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10444,5 +10459,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "" @@ -11075,13 +11090,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." -msgstr "" +#, fuzzy +msgid "Preparing objects to upload ..." +msgstr "Bilgiler hazırlanıyor..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44 @@ -11212,13 +11229,4 @@ msgstr "" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11227,5 +11235,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11418,4 +11426,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11494,5 +11503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11707,23 +11716,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "indirilen alanın dışında" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11732,11 +11741,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11745,32 +11754,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} şunları içerir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "GPX tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "" @@ -12493,6 +12502,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12516,7 +12525,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12531,5 +12540,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13428,4 +13437,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "" @@ -13542,15 +13552,13 @@ msgstr "Hızlı Çizim (kötü görünür)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Sadece yolun başında" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13700,34 +13708,39 @@ msgstr "GPS Noktaları" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Yol segmentleri için yön ipuçları çiz." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Her segment için kendi yolu buyunca sıra numarası çiz." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Daha düzgün harita grafikleri için 'antialiasing' uygula ." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Server'dan gelen bilginin sınırlarını çiz ." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz." #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Pasif tabakaları farklı renklerde çiz." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13735,5 +13748,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM Data" @@ -14982,4 +14995,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Onayla" @@ -15612,5 +15626,5 @@ msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" @@ -15664,9 +15678,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15675,21 +15689,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15697,69 +15711,69 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Kapanıyor..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17300,5 +17314,5 @@ msgstr "" -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "" @@ -19197,5 +19211,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "" @@ -19447,4 +19461,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20143,5 +20158,5 @@ msgstr "Canlı GPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "" @@ -20245,4 +20260,8 @@ msgstr "" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20437,22 +20456,22 @@ msgstr "Firefox exe" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "" @@ -21086,4 +21105,14 @@ msgid "Waypoints" msgstr "Yol noktaları" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Onaylama penceresini aç." + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22221,4 +22250,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22408,11 +22493,4 @@ "cannot apply your changes and continue editing.

    Do you want to create " "a conflict and close the editor?" -msgstr "" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." msgstr "" @@ -23950,6 +24028,11 @@ msgstr "" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -23959,15 +24042,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -23975,5 +24058,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -23981,10 +24064,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -23993,5 +24076,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24000,15 +24083,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24016,20 +24099,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24039,5 +24122,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24046,15 +24129,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24064,20 +24147,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24087,15 +24170,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24104,5 +24187,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24111,10 +24194,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24123,15 +24212,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24141,5 +24230,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24148,20 +24237,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -39583,4 +39672,323 @@ msgstr "Test" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "kısaltılmış sokak isimleri" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "noktada bir tek yön etiketi var" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "noktada bir köprü etiketi var" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "noktada yanlış bir yol etiketi var" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "referansı olmayan araçyolu" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "geçici araç yolu tipi" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "yanlış yazılmış anahtar adı" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "bisikletler için etiketli döner yol" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "yürüyüş yolu etiketli yürüyüş yolu" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "ayrı şeridi olan döner yol" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "yolda bariyer var" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "yürüyüş yolu için max hız" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "+ işaretli tabaka etiketi" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "sokak isimleri ss içerir" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "tipi olmayan ilişki" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "isimsiz restoran" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "nadir etiket kombinasyonu" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Hava Haritası aç" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Streets NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Haritası" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Sicilya - İtalya" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + #~ msgid "Update Plugins" #~ msgstr "Eklentileri Güncelle" @@ -39627,7 +40035,4 @@ #~ msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı." -#~ msgid "Preparing data..." -#~ msgstr "Bilgiler hazırlanıyor..." - #~ msgid "Error during parse." #~ msgstr "Ayrıştırma sırasında hata oluştu." @@ -39795,7 +40200,4 @@ #~ msgid "Click Reload to refresh list" #~ msgstr "Tazelemek için Yenile düğmesine basınız" - -#~ msgid "Object" -#~ msgstr "Obje" #~ msgid "" @@ -40050,4 +40452,7 @@ #~ msgid "Create non-audio markers when reading GPX." #~ msgstr "GPX dosyası okunurken sessiz imleç oluştur." + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)." #~ msgid "" @@ -40886,13 +41291,4 @@ #~ msgstr "standard" -#~ msgid "Landsat" -#~ msgstr "Landsat" - -#~ msgid "Open Aerial Map" -#~ msgstr "Hava Haritası aç" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Haritası" - #~ msgid "YAHOO (GNOME)" #~ msgstr "YAHOO (GNOME)" @@ -40909,49 +41305,4 @@ #~ msgid "Oberpfalz Geofabrik.de" #~ msgstr "Oberpfalz Geofabrik.de" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Streets NRW Geofabrik.de" - -#~ msgid "highway without a reference" -#~ msgstr "referansı olmayan araçyolu" - -#~ msgid "temporary highway type" -#~ msgstr "geçici araç yolu tipi" - -#~ msgid "misspelled key name" -#~ msgstr "yanlış yazılmış anahtar adı" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "bisikletler için etiketli döner yol" - -#~ msgid "footway with tag foot" -#~ msgstr "yürüyüş yolu etiketli yürüyüş yolu" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "ayrı şeridi olan döner yol" - -#~ msgid "barrier used on a way" -#~ msgstr "yolda bariyer var" - -#~ msgid "maxspeed used for footway" -#~ msgstr "yürüyüş yolu için max hız" - -#~ msgid "layer tag with + sign" -#~ msgstr "+ işaretli tabaka etiketi" - -#~ msgid "street name contains ss" -#~ msgstr "sokak isimleri ss içerir" - -#~ msgid "abbreviated street name" -#~ msgstr "kısaltılmış sokak isimleri" - -#~ msgid "relation without type" -#~ msgstr "tipi olmayan ilişki" - -#~ msgid "restaurant without name" -#~ msgstr "isimsiz restoran" - -#~ msgid "unusual tag combination" -#~ msgstr "nadir etiket kombinasyonu" #~ msgid "Motorboat" @@ -41193,13 +41544,4 @@ #~ msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun" -#~ msgid "bridge tag on a node" -#~ msgstr "noktada bir köprü etiketi var" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "noktada yanlış bir yol etiketi var" - -#~ msgid "oneway tag on a node" -#~ msgstr "noktada bir tek yön etiketi var" - #~ msgid "Only two nodes allowed" #~ msgstr "Sadece iki nokta olabilir" @@ -41268,5 +41610,2 @@ #~ msgid "Errors during Download" #~ msgstr "İndirme sırasında hatalarla karşılaşıldı" - -#~ msgid "Sicily - Italy" -#~ msgstr "Sicilya - İtalya" Index: /applications/editors/josm/i18n/po/uk.po =================================================================== --- /applications/editors/josm/i18n/po/uk.po (revision 25650) +++ /applications/editors/josm/i18n/po/uk.po (revision 25651) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-03-02 08:10+0000\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-19 15:57+0000\n" "Last-Translator: andygol \n" "Language-Team: Ukrainian \n" @@ -17,15 +17,15 @@ "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: 2011-03-06 15:14+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:13+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -35,12 +35,12 @@ msgstr "Довідка" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "Ігнорування невірної адреси файлу: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -76,7 +76,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -109,14 +109,14 @@ msgstr "Попередження" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "Параметр \"downloadgps\" не приймає імена файлів або URL-адреси файлів" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "Ігнорування невірної адреси: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -129,13 +129,13 @@ "більш старішу (сумісну з Java 5) версію JOSM.Більш докладно:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "Вийти з JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "Продовжити, спробувати у будь-якому випадку" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -156,4 +156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -195,18 +196,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -225,4 +226,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "Про програму…" @@ -268,5 +271,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72 msgid "Bug Reports" -msgstr "Звіти про помилки" +msgstr "Звітувати про помилки" #. @@ -309,8 +312,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "ПОПЕРЕДЖЕННЯ: неочікуваний формат базової адреси API. Перенаправлення на " @@ -416,4 +419,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -500,5 +504,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -587,6 +591,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -629,51 +633,51 @@ msgstr "Будь ласка, виберіть щонайменше три точки." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "даних" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "шару" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "виділення" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "конфлікту" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "завантаження" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "попереднього" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "наступного" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "Нічого не виділено для масштабування" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "Масштабувати до {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "Масштабувати вид до {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -683,5 +687,5 @@ msgstr "Вид: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "Немає конфліктів для показу" @@ -984,9 +988,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "Завантажити елементи, які посилаються на один із виділених елементів" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -995,5 +1000,5 @@ msgstr "Дублювати" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "Дублювати виділення шляхом копіювання і вставки." @@ -1101,5 +1106,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1476,5 +1481,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "Об’єднати виділені об’єкти в інший шар" @@ -1764,8 +1770,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "Скопійовані дані містять неповні елементи. Після вставки неповні елементи " @@ -1791,10 +1798,10 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "для {0} елемента" -msgstr[1] "для {0} елементів" -msgstr[2] "для {0} елементів" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "Вилучити {0} об’єкт" +msgstr[1] "Вилучити {0} об’єкти" +msgstr[2] "Вилучити {0} об’єктів" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1915,4 +1922,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2474,5 +2482,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:21 msgid "Viewport Following" -msgstr "Переміщення мапи у вікні перегляду" +msgstr "Центрування мапи у вікні перегляду" #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:23 @@ -2484,5 +2492,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24 msgid "Toggle Viewport Following" -msgstr "Переміщення мапи у вікні перегляду" +msgstr "Центрування мапи у вікні перегляду" #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23 @@ -2889,5 +2897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2895,4 +2903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3535,7 +3544,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3549,8 +3558,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "" "Попередження: Шар''{0}''більше не існує. Неможливо вилучити конфлікт для " @@ -3773,10 +3782,10 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "Відновити {0} елемент" -msgstr[1] "Відновити {0} елементи" -msgstr[2] "Відновити {0} елементів" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "Вилучити {0} об’єкт" +msgstr[1] "Вилучити {0} об’єкти" +msgstr[2] "Вилучити {0} об’єктів" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -4096,5 +4105,5 @@ msgstr "Не в кеші" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -4158,8 +4167,9 @@ msgstr "Відсутній результат об’єднання для типу {0} з ідентифікатором {1}" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4323,5 +4333,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "тло" @@ -5034,5 +5044,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -5046,4 +5056,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5549,6 +5560,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5668,5 +5679,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "Фон" @@ -5929,5 +5940,5 @@ "використовується." -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5935,10 +5946,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "Вид" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5946,5 +5957,5 @@ msgstr "Інструменти" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5952,5 +5963,5 @@ msgstr "Заготовки" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5961,5 +5972,5 @@ msgstr "Меню: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "Звук" @@ -6368,7 +6379,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "" "Наступні елементи не можливо скопіювати у вказаний елемент,
    тому що вони " @@ -6376,5 +6388,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "Збій під час об’єднання вилучених елеменів" @@ -6654,8 +6667,10 @@ msgstr "Посилається на:" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(відсутній)" @@ -6695,5 +6710,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "Елемент" @@ -6931,6 +6945,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6942,5 +6956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -7143,5 +7157,4 @@ msgstr "Відкрити список всіх команд (буфер відміни)." -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -7152,5 +7165,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -7158,7 +7171,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -7190,9 +7204,9 @@ msgstr "Конфлікти: {0} не розв’язано" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "Розв’язано" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -7200,5 +7214,5 @@ "об’єктів." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7561,5 +7575,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88 msgid "MapPaint" -msgstr "" +msgstr "Розфарбовування мапи" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304 @@ -7797,11 +7811,11 @@ msgstr "Натисніть на для зменшення/збільшення вмісту панелі" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "Автори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "Показати список людей, що працюють з виділеними об’єктами." @@ -7816,5 +7830,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "Вибрати елементи, створені цим користувачем" @@ -7888,4 +7903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "Виправити" @@ -8110,5 +8126,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "Завантажити та показати історію вибраних елементів" @@ -8152,5 +8169,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "Наблизитися до відповідних елементів у поточному шарі даних" @@ -9287,6 +9305,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "" @@ -9800,6 +9819,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "Запустити оглядач з вікі-довідкою для вибраного об’єкту" +msgid "Launch browser with wiki help for selected object" +msgstr "Запустити оглядач для огляду довідки по виділеному об’єкту" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9854,8 +9873,8 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" -msgstr "" -"Нащадка зв’язку
    {0}
    вилучено з сервера. Його не можливо " -"завантажити" +"loaded" +msgstr "" +"Підпорядкований зв’язок
    {0}
    вилучений на сервері. Його не " +"можливо завантажити" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9947,8 +9966,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" @@ -9958,5 +9977,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "Кілька членів посилаються на один і той же елемент" @@ -9973,12 +9993,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "" "Додати всі елементи, виділені в поточному наборі даних, перед першим членом" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "" "Додати всі елементи, виділені в поточному наборі даних, після останнього " @@ -9986,6 +10006,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "" @@ -9994,6 +10015,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "" @@ -10002,5 +10024,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "Вилучити всіх членів, що відносяться до любого з виділених елементів" @@ -10012,13 +10035,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "Виділити членів зв’язку, які відносяться до вибраних елементів" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "" "Виділити членів зв’язку, які відносяться до {0} елем. серед виділених " @@ -10026,5 +10048,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "Виділити елементи для виділених членів зв’язку" @@ -10124,11 +10147,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." -msgstr "" -"Шар ''{0}'' має конфлікт для елементу
    ''{1}''.
    Будь ласка " -"розв’яжіть конфлікти, а потім спробуйте ще раз." +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." +msgstr "" +"В шарі ''{0}'' вже є конфлікт для об’єкта
    ''{1}''.
    Будь ласка, " +"спочатку розв’яжіть цей конфлікт, а потім спробуйте знову.." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -10178,7 +10202,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "Ви призначити пусту роль {0} елементу." msgstr[1] "Ви призначити пусту роль {0} елементам." @@ -10186,5 +10210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "Це дорівнює вилученю ролі цих елементів." @@ -10475,6 +10500,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "Натисніть, щоб завантажити позначену ділянку" +msgid "Click to download the currently selected area" +msgstr "Клацніть, щоб завантажити виділену ділянку" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10486,9 +10511,9 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"Ні {0} ні {1} не можливо.
    Будь " -"ласка, виберіть чи завантажити дані OSM, чи дані GPX, або і перше і друге." +"
    Please choose to either download OSM data, or GPX data, or both." +msgstr "" +"Ні {0}, ні {1} недоступні.
    Будь " +"ласка, оберіть чи завантажити данні OSM, чи данні GPX, або завантажити їх " +"разом." #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10571,4 +10596,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10653,5 +10679,6 @@ msgstr "Оглядач довідки JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10659,18 +10686,18 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -"

    Відсутній вміст розділу довідки

    Вміст довідки для розділу довідки {0} ще не написано. Варіант мовою ({1}) та англомовний варіанти поки " -"відсутні.

    Будь ласка, допоможіть покращити довідкову систему JOSM та " -"додайте відсутню інформацію. Ви можете виправити розділ довідки,     вашою мовою ({1}) та — розділ англійською." - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 +"

    Допомога по цій темі відсутиня

    Допомога для теми {0} ще не доступна. Вона " +"відсутня, як вашою мовою ({1}) так і англійською.

    Будь ласка, " +"допоможіть покращити довідкову систему JOSM та напишіть довідку по відсутній " +"темі. You can both edit the help topic in your local " +"language ({1}) and the help topic in English.

    " + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10685,5 +10712,5 @@ "
    {1}

    " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10695,19 +10722,19 @@ "з інтернет" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "Не вдалося відкрити URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "Відкрити поточну сторінку довідки в зовнішньому оглядачі" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "Правити поточну сторінку довідки" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10719,33 +10746,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "Перезавантажити поточну сторінку довідки" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "Перейти до попередньої сторінки" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "Перейти до наступної сторінки" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "Перейти до початкової сторінки довідки JOSM" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "Попередження: невірне розташування в документі HTML. Помилка: {0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "Не вдалося відкрити сторінку довідки. Цільовий URL порожній." -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "Не вдалося відкрити сторінку довідки." @@ -10861,4 +10888,8 @@ msgid "Relation {0}" msgstr "Зв’язок {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "Об'єкт" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10986,5 +11017,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "Виявлено конфлікт" @@ -11696,14 +11727,16 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "" -"Попередження: елемент ''{0}'' вже вилучено з сервера. Повторне надсилання на " -"сервер буде здійснено без цього елементу." +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"Попередження: об’єкт ''{0}'' вилучений на сервері. Дані будуть знову " +"надіслані на сервер, але без цього об’єкта." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "Підготовка елементів до надсилання на сервер…" @@ -11867,15 +11900,4 @@ msgstr "Набір змін заповнений" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"Попередження: об’єкт ''{0}'' вилучений на сервері. Дані будуть знову " -"надіслані на сервер, але без цього об’єкта." - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11886,5 +11908,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -12100,4 +12122,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -12182,5 +12205,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -12403,23 +12426,23 @@ msgstr "ПОМИЛКА" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "Шар даних {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "по-за межами завантаженої ділянки" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "версія {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Увага: спільне використання даних версій 0.6 і 0.5 у версії 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -12429,11 +12452,11 @@ msgstr[2] "Виявлено {0} конфліктів." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "Натисніть, щоб закрити цей діалог і продовжити редагування" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -12443,32 +12466,32 @@ msgstr[2] "{0} вилучено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} складається з:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "відключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "Версія API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "Перетворити в шар GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "Тест узгодженості набору даних" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "Проблем не виявлено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "Виявлені наступні проблеми:" @@ -13234,6 +13257,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -13265,7 +13288,7 @@ "\"Інформація\" контекстного меню." -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -13281,5 +13304,5 @@ "Невірний шаблон переривчастою лінії, принаймні, одне значення має бути> 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -14287,4 +14310,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "Нічого" @@ -14402,17 +14426,13 @@ msgstr "Швидке креслення (виглядає гірше)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "" -"Показувати тільки корисні підказки напряму (наприклад - з теґом дороги з " -"одностороннім рухом)." - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "Тільки на початку лінії." + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "Стрілки для одностороннього руху." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -14572,25 +14592,32 @@ msgstr "Точки GPS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "Показувати напрямок на відрізках ліній." +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" +"Показувати стрілки для доріг з одностороннім рухом та для інших елементів, " +"що мають напрямок." + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "Показувати порядкові номери на всіх відрізках лінії." #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "Застосувати згладжування мапи." #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "Показувати межі ділянки, завантаженої з сервера." #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "" @@ -14598,9 +14625,9 @@ #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "Показувати неактивні шари даних іншим кольором." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -14610,5 +14637,5 @@ "обраному стилі." -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "Дані OSM" @@ -15952,4 +15979,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "Перевірити" @@ -16620,7 +16648,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "" "Сервер повідомив про помилку з кодом 404, повторити з індивідуальними " @@ -16677,9 +16706,9 @@ msgstr "Налаштування ''{0}'' відсутнє. Не можливо ініціалізувати OsmApi." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "Ця версія JOSM несумісна з налаштованим сервером." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -16690,21 +16719,21 @@ "{0} - {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "Зв’язок з {0} встановлено за допомогою протоколу версії {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "Шар {0} вилучено, тому що його заборонено в налаштуваннях API." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "Сервер повернув неочікуваний формат ідентифікатора. Отримано ''{0}''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -16714,64 +16743,64 @@ "''{1}''." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "Створення набору змін…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "Набір змін {0} успішно відкрито" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "Очікується ідентифікатор набору змін > 0. Отримано {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "Оновлення набору змін…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "Оновлення набору змін {0}…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "Закриття набору змін…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "Набори змін для надсилання відмінностей відсутні." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "Підготовка запиту для надсилання…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "Очікування 10 секунд… " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Спроба {0} з {1} через {2} секунди…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "Так — спробуємо ще раз." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "Спроба {0} з {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "Поточний набір змін порожній. Не вдається надіслати дані." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -16779,5 +16808,5 @@ "Треба, щоб ідентифікатор поточного набору змін був > 0. Поточний Ід.: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -18516,5 +18545,5 @@ msgstr "Помилка в лінії " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "Відсутній аудіо файл" @@ -20571,5 +20600,5 @@ "перетягування шматка лінії" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "Злиття контурів" @@ -20826,4 +20855,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -21056,116 +21086,116 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java:96 msgid "Channel-Digraph created from the active OSM-Layer" -msgstr "" +msgstr "Канал-Орграф створено з активного шару OSM" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:42 msgid "Create Channel Digraph" -msgstr "" +msgstr "Створити Канал Орграф" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:68 msgid "this layer is no osm data layer" -msgstr "" +msgstr "цей шар не є шаром даних osm" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:81 msgid "Converting OSM graph into Channel Digraph" -msgstr "" +msgstr "Перетворення графа OSM в канал орграфу" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:110 msgid "filtering ways" -msgstr "" +msgstr "фільтрування ліній" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:119 msgid "creating Channel-Digraph" -msgstr "" +msgstr "створення Каналу-Орграфу" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:127 msgid "sealing Digraph" -msgstr "" +msgstr "ущільнення Орграфу" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:135 msgid "calculating Strong Connectedness" -msgstr "" +msgstr "розрахунок Міцності Зв’язаності" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:139 msgid "creating DigraphLayer" -msgstr "" +msgstr "створення ШаруОргафу" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47 msgid "JunctionChecking" -msgstr "" +msgstr "Перевірка Розв’язок" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:47 msgid "Open the junctionchecking window." -msgstr "" +msgstr "Відкрити вікно для перевірки розв’язок" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 msgid "junctions" -msgstr "" +msgstr "розв’язки" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:53 msgid "Channel-Digraph creation" -msgstr "" +msgstr "Створення Каналу-Орграфу" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:54 msgid "seal Channel Digraph" -msgstr "" +msgstr "ущільнення Каналу Орграфу" #. digraphPanel.add(digraphsealcb); #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:58 msgid "calculate strong connected channels" -msgstr "" +msgstr "обчислення міцно зв’язаних каналів" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:64 msgid "Junctionchecking/junctions searching" -msgstr "" +msgstr "Перевірка/пошук розв’язок" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:70 msgid "order of junction (n):" -msgstr "" +msgstr "порядок виїзду (n):" #. Elemente zur OSM-Relationen-Erzeugung #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:76 msgid "produce OSM-Relations: junction" -msgstr "" +msgstr "створити Зв’язок (OSM): розв’язку" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:77 msgid "" "if enabled the plugin produces osm-relations from the junction subgraphs" -msgstr "" +msgstr "якщо увімкнено, втулок створює зв’язки-osm з під-графів розв’язок" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "Create" -msgstr "" +msgstr "Створити" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:91 msgid "start the channel digraph creation" -msgstr "" +msgstr "розпочати створення каналу орграфу" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:92 msgid "create the channel digraph" -msgstr "" +msgstr "створити канал орграфа" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94 msgid "Check " -msgstr "" +msgstr "Перевірити " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:94 msgid "check a marked subset if it is a junction" -msgstr "" +msgstr "перевірити позначену підмножину, чи є вона розв’язкою" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:95 msgid "check the subust for junction properties" -msgstr "" +msgstr "перевірити підмножину на відповідність параметрам розв’язки" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 msgid "Search " -msgstr "" +msgstr "Пошук " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:98 msgid "search for junctions into a subset of channels" -msgstr "" +msgstr "пошук розв’язки у підмножині каналів" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:99 msgid "search for junctions in the channel subset" -msgstr "" +msgstr "пошук розв'язок у підмножині каналів" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:55 @@ -21174,25 +21204,27 @@ "candidat mark these channel and press the \"Check\" button again." msgstr "" +"Позначені канали містять можливі розв’язки (білим). Для перевірки позначте " +"цей канал та натисніть кнопку «Перевірити» знов." #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:59 #, java-format msgid "The marked channels are a {0}-ways junction" -msgstr "" +msgstr "Позначені канали є розв’язкою {0} шляхів" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckTask.java:69 msgid "The marked channels are not a junction:" -msgstr "" +msgstr "Позначені канали не є розв’язкою:" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckerPlugin.java:44 msgid "construct channel digraph and search for junctions" -msgstr "" +msgstr "побудувати канал орграфа ташукати розв’язки" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionSearchTask.java:55 msgid "Number of {0]-ways junctions found: " -msgstr "" +msgstr "Знайдено розв’язки {0} шляхів у кількості: " #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JMinimality.java:83 msgid "generate all combinations from entrie/exit candidates" -msgstr "" +msgstr "згенерувати усі варіанти в’їзду/виїзду з/на розв’язку" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69 @@ -21536,5 +21568,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "Відерити MapDust" @@ -21640,4 +21672,8 @@ msgstr "Одна з виділених ліній вже є частиною іншого мультіполігону." +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "Про втулок" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -21841,24 +21877,24 @@ msgstr "виконуваний файл Firefox" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "" "Помилка перетворення: Мінімальне значення X повинно бути менше за максимальне" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "" "Помилка перетворення: Мінімальне значення Y повинно бути менше максимального" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "Помилка перетворення: Точки дуже близько друг до друга" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "Помилка перетворення: Непідтримуваний варіант." -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "Помилка перетворення: Непідтримувана орієнтація" @@ -22499,4 +22535,14 @@ msgid "Waypoints" msgstr "Маршрутні точки" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "Редактор зв’язків: Впорядкувати" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -23667,4 +23713,61 @@ msgid "Create a new signing key" msgstr "Створіть новий ключ для підписування" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" +"Редагувати зв’язок на обмеження руху та довжину смуг для виділеної точки." + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "Перевірка зв’язків на обмеження руху та довжину смуг на узгодженість." + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "Смуги для повороту" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "Редагувати смуги для повороту" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "Швидка правка" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "Перевірити ще раз всі зв’язки." + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "Автоматично виправляти проблеми." + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "Позначити неправильні зв’язки" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "{0} смуг(а|и) не належать до жодного зв’язку." + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "Встановіть порядок проїзду." + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "Зв’язок посилається на неіснуючу (звичайну) смугу {0}" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "Зв’язок посилається на неіснуючу додаткову смугу {0}" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "Список \"{0}\" містить не очікуванні значення." #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 @@ -23885,13 +23988,4 @@ "конфлікт і закрити редактор?" -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." -msgstr "" -"В шарі ''{0}'' вже є конфлікт для об’єкта
    ''{1}''.
    Будь ласка, " -"спочатку розв’яжіть цей конфлікт, а потім спробуйте знову.." - #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 msgid "Already participating in a conflict" @@ -25515,4 +25609,6 @@ "junction or searches in a subset of channels for junctions" msgstr "" +"створює орграф та перевіряє підмножини каналів на те, чи є вони розв’язками, " +"або шукає у підмножинах каналів розв’язки" #. Plugin lakewalker @@ -25551,6 +25647,13 @@ msgstr "Легко перетворює ділянку у мультиполігон." +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" +"Дозволяє призначити теґи до всіх об'єктів в будь-якій виділеній області за " +"один раз" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -25563,15 +25666,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "Розширені параметри для редагування opening_hours" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "Імпорт запитів з OpenStreetBugs" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -25581,5 +25684,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -25587,10 +25690,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "Імпортує дані з PDF файлу та перетворює їх на лінії." #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -25601,5 +25704,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -25610,15 +25713,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "Чудовий JGoodies Пластиковий Скін." #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "додати проекції з Proj4J" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -25627,20 +25730,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "Додає в меню Файл рядок «Перезапустити JOSM»." #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "Втулок для відміни наборів змін" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "Використовувати малюнок з rgis.spb.ru як прошарок" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -25653,5 +25756,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -25662,15 +25765,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "Надає можливості маршрутизації." #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "Дозволяє виконувати сценарії в JOSM." #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -25683,20 +25786,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "Створення та редагування морських мап для OpenSeaMap" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "Дозволяє додавати мітки/точки в поточній позиції GPS ." #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показує вікно для редагування теґів в табличному вигляді." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -25709,15 +25812,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "Зробити ряд будинків по вулиці з одного блоку." #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "Для створення та редагування навігаційних знаків для OpenSeaMap" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -25729,5 +25832,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -25738,10 +25841,18 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "Втулок для накладення цифрового підпису на дані OSM" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" +"Надає простий графічний інтерфейс для додавання, редагування та вилучення " +"порядку проїзду по смугах." + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -25752,15 +25863,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "Кілька інструментів, що полегшать ваше життя." #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -25773,5 +25884,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -25782,20 +25893,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "Дозволяє пошук маршрутних точок імпортованих із файлу gpx." #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -41233,4 +41344,349 @@ msgstr "Перевірка" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "скорочена назва вулиці" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "теґ oneway у точці" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "теґ bridge у точці" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "невірний теґ highway у точці" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "Безіменна дорога без класифікації" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "дорога без номера" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "тимчасовий тип дороги" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "помилка в ключі" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "велодоріжка з теґом bicycle" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "пішохідна доріжка з теґом foot" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "окрема смуга для велосипедів (велодоріжка)" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "на шляху перешкоди для велосипедів" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "максимальна швидкість руху транспорту дозволена на пішохідній доріжці" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "теґ layer зі знаком +" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "назва вулиці містить ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "зв’язок без типу" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "ресторан без імені" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "незвичайна комбінація теґів" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Тло Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (дзеркало)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "Тло Open Aerial Map" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "Знімки Bing" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Тло Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "MapQuest Open Aerial" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "PNV (tile.öpnvkarte.de)" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "Вулиці NRW Geofabrik.de" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "Походи та вело-подорожі" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "Мапа Сербії" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "Мапа Німеччини" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "Geoimage.at" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "Топографічні мапи MSR" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "Міські мапи MSR" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "Чехія CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "Чехія UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "Мапи NPE" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "Мапи NPE (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "Японія MLIT (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "Японія MLIT (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "Японія MLIT (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "Японія MLIT (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "Італия – Лоді" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "Італія – Сицилія" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 — Італія" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps (Франція)" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "PNOA Spain (Іспанія)" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "Основна мапа Естонії (Maaamet)" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "Орто мапа Естонії (Maaamet)" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "Мулти мапа Естонії (Maaamet)" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "Fugro (Данія)" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "для {0} елемента" +#~ msgstr[1] "для {0} елементів" +#~ msgstr[2] "для {0} елементів" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "Відновити {0} елемент" +#~ msgstr[1] "Відновити {0} елементи" +#~ msgstr[2] "Відновити {0} елементів" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
    ''{1}''." +#~ "
    Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "Шар ''{0}'' має конфлікт для елементу
    ''{1}''.
    Будь ласка " +#~ "розв’яжіть конфлікти, а потім спробуйте ще раз." + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "Попередження: елемент ''{0}'' вже вилучено з сервера. Повторне надсилання " +#~ "на сервер буде здійснено без цього елементу." + #~ msgid "Do not show again" #~ msgstr "Не показувати знову" @@ -41402,7 +41858,4 @@ #~ msgid "Remove the member in the current table row from this relation" #~ msgstr "Видалити складову в поточному рядку таблиці з цього відношення" - -#~ msgid "Object" -#~ msgstr "Об'єкт" #~ msgid "Click Reload to refresh list" @@ -42002,4 +42455,39 @@ #~ msgid "Filter Hidden: {0} Disabled: {0}" #~ msgstr "Фільтр Приховано: {0} Відключено: {0}" + +#~ msgid "" +#~ "The child relation
    {0}
    is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "" +#~ "Нащадка зв’язку
    {0}
    вилучено з сервера. Його не можливо " +#~ "завантажити" + +#~ msgid "Click do download the currently selected area" +#~ msgstr "Натисніть, щоб завантажити позначену ділянку" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "Ні {0} ні {1} не можливо.
    Будь " +#~ "ласка, виберіть чи завантажити дані OSM, чи дані GPX, або і перше і друге." +#~ "" + +#~ msgid "" +#~ "

    Help content for help topic missing

    Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

    " +#~ msgstr "" +#~ "

    Відсутній вміст розділу довідки

    Вміст довідки для розділу довідки {0} ще не написано. Варіант мовою ({1}) та англомовний варіанти поки " +#~ "відсутні.

    Будь ласка, допоможіть покращити довідкову систему JOSM " +#~ "та додайте відсутню інформацію. Ви можете виправити розділ довідки, вашою мовою ({1}) та — розділ " +#~ "англійською.

    " #~ msgid "Enter an upload comment (min. 3 characters)" @@ -42072,4 +42560,9 @@ #~ msgstr "Створити не звукові мітки при обробці GPX даних" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "" +#~ "Показувати тільки корисні підказки напряму (наприклад - з теґом дороги з " +#~ "одностороннім рухом)." + #~ msgid "Used style" #~ msgstr "Використовується стиль" @@ -42293,7 +42786,4 @@ #~ msgid "The \"to\" way does not start or end at the \"via\" way." #~ msgstr "Лінія «до» не починається/закінчується на лінії «через»." - -#~ msgid "abbreviated street name" -#~ msgstr "скорочена назва вулиці" #~ msgid "Select, move and rotate objects" @@ -42527,115 +43017,9 @@ #~ msgstr "стандарт" -#~ msgid "bridge tag on a node" -#~ msgstr "теґ bridge у точці" - -#~ msgid "oneway tag on a node" -#~ msgstr "теґ oneway у точці" - -#~ msgid "misspelled key name" -#~ msgstr "помилка в ключі" - -#~ msgid "temporary highway type" -#~ msgstr "тимчасовий тип дороги" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "Безіменна дорога без класифікації" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "невірний теґ highway у точці" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "велодоріжка з теґом bicycle" - -#~ msgid "footway with tag foot" -#~ msgstr "пішохідна доріжка з теґом foot" - -#~ msgid "highway without a reference" -#~ msgstr "дорога без номера" - -#~ msgid "Landsat" -#~ msgstr "Тло Landsat" - -#~ msgid "unusual tag combination" -#~ msgstr "незвичайна комбінація теґів" - -#~ msgid "maxspeed used for footway" -#~ msgstr "" -#~ "максимальна швидкість руху транспорту дозволена на пішохідній доріжці" - -#~ msgid "barrier used on a way" -#~ msgstr "на шляху перешкоди для велосипедів" - -#~ msgid "Open Aerial Map" -#~ msgstr "Тло Open Aerial Map" - -#~ msgid "street name contains ss" -#~ msgstr "назва вулиці містить ss" - -#~ msgid "layer tag with + sign" -#~ msgstr "теґ layer зі знаком +" - -#~ msgid "separate cycleway as lane on a cycleway" -#~ msgstr "окрема смуга для велосипедів (велодоріжка)" - -#~ msgid "relation without type" -#~ msgstr "зв’язок без типу" - -#~ msgid "restaurant without name" -#~ msgstr "ресторан без імені" - -#~ msgid "NPE Maps" -#~ msgstr "Мапи NPE" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "Чехія UHUL:ORTOFOTO" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "Чехія CUZK:KM" - #~ msgid "Terraserver Urban" #~ msgstr "Terraserver Urban" -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "Yahoo Sat" -#~ msgstr "Тло Yahoo Sat" - -#~ msgid "Streets NRW Geofabrik.de" -#~ msgstr "Вулиці NRW Geofabrik.de" - #~ msgid "Terraserver Topo" #~ msgstr "Terraserver Topo" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "Мапи NPE (Tim)" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "Японія MLIT (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "Японія MLIT (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "Японія MLIT (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "Японія MLIT (ORTHO03)" - -#~ msgid "Lodi - Italy" -#~ msgstr "Італия – Лоді" - -#~ msgid "Sicily - Italy" -#~ msgstr "Італія – Сицилія" #~ msgid "Please select at least two nodes to merge." @@ -42801,10 +43185,4 @@ #~ "посилання:" -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 — Італія" - -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (дзеркало)" - #~ msgid "Internal style" #~ msgstr "Внутрішній стиль" @@ -42861,4 +43239,7 @@ #~ msgstr "Рівень масштабування недостатній для запису точного зміщення" +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "Запустити оглядач з вікі-довідкою для вибраного об’єкту" + #~ msgid "Plugin for Seamap Editor" #~ msgstr "Втулок редактора Seamap" @@ -42875,7 +43256,4 @@ #~ msgid "Seamap Editor" #~ msgstr "Редактор Seamap" - -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps (Франція)" #~ msgid "Seanap Editor" Index: /applications/editors/josm/i18n/po/zh_CN.po =================================================================== --- /applications/editors/josm/i18n/po/zh_CN.po (revision 25650) +++ /applications/editors/josm/i18n/po/zh_CN.po (revision 25651) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" -"PO-Revision-Date: 2011-02-19 12:35+0000\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" +"PO-Revision-Date: 2011-03-07 12:46+0000\n" "Last-Translator: mmyfl \n" "Language-Team: Simplified Chinese \n" @@ -16,15 +16,15 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:26+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:29+0000\n" +"X-Generator: Launchpad (build 12617)\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -34,12 +34,12 @@ msgstr "帮助(H)" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "忽略格式不良的文件 URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../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/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -108,14 +108,14 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "参数 \"downloadgps\" 不能使用文件名称或文件 URL" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "忽略不正确的 URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -127,13 +127,13 @@ "Java (JRE) 或
  • 使用较旧版本的 (兼容 Java 5) JOSM。
    • 更多信息:" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "退出 JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "强制继续" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -154,4 +154,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -193,18 +194,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -223,4 +224,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "关于" @@ -307,8 +310,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 主网站的信息或历史记录页面" @@ -412,4 +415,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -492,5 +496,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -579,6 +583,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -621,51 +625,51 @@ msgstr "请选择至少3个节点." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "数据" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "图层" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "选择" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "冲突" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "下载" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "上一个" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "下一个" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "没有选择缩放对象." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "缩放到 {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "将视图缩放至 {0} 。" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -675,5 +679,5 @@ msgstr "查看: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "没有冲突可以缩放" @@ -971,9 +975,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "下载参照到已选取原型中之一的原型" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -982,5 +987,5 @@ msgstr "制作副本" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "制作副本会复制选择区域并立即粘贴上。" @@ -1088,5 +1093,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1123,4 +1128,7 @@ "If you want to save the offset as bookmark, enter the bookmark name below" msgstr "" +"使用方向键或用鼠标拖曳图片图层来调整图片偏移。\n" +"您也可以在 {0} 坐标中输入东方和北方的偏移。\n" +"如果您想要将偏移保存为书签，请在下面输入书签名称" #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:165 @@ -1303,5 +1311,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "您也可以粘贴上 www.openstreetmap.org 的网址" +msgstr "您也可以粘贴上来自 www.openstreetmap.org 的网址" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 @@ -1361,5 +1369,5 @@ #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109 msgid "Custom WMS Link" -msgstr "自定义 WMS 连结" +msgstr "自定义 WMS 连接" #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116 @@ -1438,5 +1446,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "将目前选取的原型合并到另一个图层" @@ -1706,8 +1715,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "复制的资料含有不完整的原型。当粘贴的时候不完整的原型会被移除。您确定要粘贴含" @@ -1731,8 +1741,8 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "到 {0} 个原型" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "删除 {0} 个对象" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1847,4 +1857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2752,5 +2763,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2758,4 +2769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3371,7 +3383,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3385,8 +3397,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "警告：图层 \"{0}\" 已不存在。不能删除原型 \"{1}\" 的冲突。" @@ -3586,8 +3598,8 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "取消删除 {0} 个原型" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "删除 {0} 个对象" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3886,5 +3898,5 @@ msgstr "不在缓存中" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3944,8 +3956,9 @@ msgstr "缺少 id {1} 类型 {0} 的合并目标" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4096,5 +4109,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "背景" @@ -4119,5 +4132,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg3008.java:29 msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)" -msgstr "" +msgstr "SWEREF99 13 30 / EPSG:3008 (瑞典)" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -4216,5 +4229,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23 msgid "LKS-92 (Latvia TM)" -msgstr "" +msgstr "LKS-92 (拉脱维亚 TM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64 @@ -4389,5 +4402,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:197 msgid "Duplicate nodes in two un-closed ways" -msgstr "" +msgstr "两个未封闭路径有重复的节点" #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:208 @@ -4795,5 +4808,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4807,4 +4820,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5264,5 +5278,5 @@ #, java-format msgid "House number {0} at {1}" -msgstr "" +msgstr "房屋门牌号码 {0} 于 {1}" #. I18n: house number as parameter @@ -5302,6 +5316,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5417,5 +5431,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "图像(I)" @@ -5658,5 +5672,5 @@ msgstr "首选项 {0} 已经被删除，因为它已不再使用了。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5664,10 +5678,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "查看(V)" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5675,5 +5689,5 @@ msgstr "工具(T)" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5681,5 +5695,5 @@ msgstr "预设组合(P)" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5690,5 +5704,5 @@ msgstr "菜单: {0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "音效(A)" @@ -5776,5 +5790,5 @@ "Middle click again to cycle through.
    Hold CTRL to select directly from " "this list with the mouse.
    " -msgstr "按鼠标中键可以进行循环。
    按住CTRL 可以用鼠标直接从清单中选择。
    " +msgstr "按鼠标中键可以进行循环。
    按住 CTRL 可以用鼠标直接从清单中选择。
    " #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:327 @@ -6082,11 +6096,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "下列原型无法复制到目标原型，
    因为它们已经在目标数据组合中被删除了：" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "合并删除的原型失败" @@ -6338,8 +6354,10 @@ msgstr "参照于：" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "(没有)" @@ -6379,5 +6397,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "原型" @@ -6610,6 +6627,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6619,5 +6636,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6812,5 +6829,4 @@ msgstr "开启所有命令的清单(恢复缓冲区)。" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6821,5 +6837,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6827,7 +6843,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6858,13 +6875,13 @@ msgstr "冲突：{0} 未调解" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "调解" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "开启上列清单所有选取的项目的合并对话框。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7213,5 +7230,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:48 msgid "Map Paint Styles" -msgstr "地图绘制样式" +msgstr "地图样式" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87 @@ -7278,5 +7295,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:605 msgid "Title:" -msgstr "" +msgstr "标题:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:607 @@ -7286,5 +7303,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609 msgid "Built-in Style, internal path:" -msgstr "" +msgstr "内建样式，内部路径:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611 @@ -7294,9 +7311,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:614 msgid "Icon:" -msgstr "" +msgstr "图标:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:617 msgid "Background:" -msgstr "" +msgstr "背景:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619 @@ -7455,11 +7472,11 @@ msgstr "点击以最小化/最大化面板内容" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "作者" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "开启在编辑选取对象的用户的清单。" @@ -7472,5 +7489,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "选择由这个用户提交的原型" @@ -7505,4 +7523,5 @@ "agreed to the new contributor terms will show a green check mark." msgstr "" +"从服务器载入有关更新授权的信息。已同意使用新贡献者条款的用户会显示绿勾标记。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:322 @@ -7538,4 +7557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "修正" @@ -7759,5 +7779,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "下载并显示选取原型的历史记录" @@ -7793,5 +7814,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "缩放到目前数据图层对应的原型" @@ -8925,6 +8947,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "缩放到目前数据图层这个修改集合的内容的原型" @@ -9410,6 +9433,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "在浏览器中启动选定对象的维基帮助页" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9461,6 +9484,6 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" -msgstr "子关系
    {0}
    已在服务器中删除。它已无法载入" +"loaded" +msgstr "子关系
    {0}
    已在服务器中删除。它已无法载入" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9546,8 +9569,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" @@ -9556,5 +9579,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "多个成员参照到同一原型" @@ -9570,27 +9594,30 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "将目前数据组合中选取的所有原型加到第一个成员之前" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "将目前数据组合中选取的所有原型加到最后一个成员之后" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "将目前数据组合中选取的所有原型加到第一个选取的成员之前" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "将目前数据组合中选取的所有原型加到最后一个选取的成员之后" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "删除所有参照到选取原型其中之一的成员" @@ -9602,17 +9629,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "选取参照到目前选取范围的关系成员" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "选取参照到目前选取范围{0} 原型的关系成员" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "选择已选取关系成员的原型" @@ -9709,11 +9736,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." -msgstr "" -"图层 \"{0}\" 已经有冲突于原型
    \"{1}\"。
    请先调解这个冲突，然后再" -"试一次。\"" +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." +msgstr "" +"html>图层 \"{0}\" 已经有冲突于对象
    \"{1}\"。
    请先调解这个冲突，然后再试" +"一次。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 @@ -9763,11 +9791,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "您正在设定{0} 个原型的空白角色。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "这样等同删除这些原型的角色。" @@ -10047,6 +10076,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "点击以下载目前选取的区域" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10058,8 +10087,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"不论{0} 或 {1} 都没有启用。
    请选择" -"下载 OSM 数据，或 GPX 数据，或两个都选。" +"
    Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10142,4 +10169,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10224,5 +10252,6 @@ msgstr "JOSM 帮助文件浏览器" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10230,16 +10259,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -"

    缺少帮助主题的内容

    帮助主题的内容 {0} 尚不能取得。不管是您当地语言 " -"({1}) 或是英语版本都没有。

    请帮助改进 JOSM 帮助系统并填好缺少的信息。" -"您可以编辑    将帮助主题编辑为当地的语言 ({1}) 和 英语版本。

    " - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10253,5 +10277,5 @@ "
    {1}

    " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10262,19 +10286,19 @@ "的互联网网络连接" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "无法开启 URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "在外部浏览器开启目前的帮助页面" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "编辑目前的说明页面" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10286,33 +10310,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "重新载入目前的说明页面" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "回到上一页" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "前往下一页" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "转到 JOSM 帮助首页" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "警告：在HTML 文件中有错误的位置。例外为：{0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "无法开启帮助页面。目标URL 是空的。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "无法开启说明页面" @@ -10424,4 +10448,9 @@ msgid "Relation {0}" msgstr "关系 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +#, fuzzy +msgid "Object" +msgstr "对象" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10539,5 +10568,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "选取的冲突" @@ -11190,12 +11219,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "警告：原型 \"{0}\" 已在服务器上删除了。正跳过这个原型并尝试重新上传。" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"警告：对象 \"{0}\" 已经在服务器端被删除了。现在跳过这个对象并重新尝试上传。" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "正在准备要上传的原型 ..." @@ -11338,14 +11370,4 @@ msgstr "修改集合已满" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"警告：对象 \"{0}\" 已经在服务器端被删除了。现在跳过这个对象并重新尝试上传。" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11354,5 +11376,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11546,4 +11568,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11622,5 +11645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11837,23 +11860,23 @@ msgstr "错误" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "数据图层 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "超出下载的区域" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "版本 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告：混合 0.6 和 0.5 数据会成为 0.5 版" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11861,11 +11884,11 @@ msgstr[0] "检测到 {0} 个冲突。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "按这里关闭这个对话框并继续编辑" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11873,32 +11896,32 @@ msgstr[0] "{0} 已删除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} 组成：" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "取消设定" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API 版本： {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "转换为 GPX 图层" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "数据组合一致性测试" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "没有发现问题" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "发现下列问题：" @@ -12048,5 +12071,5 @@ "tiles anyway?" msgstr "" -"这个 WMS 图层的基础 URL
    \"{0}\"
    的结尾不能是 \"&\" 或 \"?\" 。" +"这个 WMS 图层的基础 URL
    \"{0}\"
    的结尾不能是 \"&\" 或 \"?\" 。" "
    这可能会导致无效的 WMS 要求。您应该检查您的
    首选项值。
    是否要强制取" "回 WMS 拼贴?\"" @@ -12620,6 +12643,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12643,7 +12666,7 @@ "加载这种样式时发生了 {0} 个错误。查看详细信息，请从右键菜单中选择\"信息\"。" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12658,5 +12681,5 @@ msgstr "非法的虚线模式，至少有一个值必须 > 0" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13607,4 +13630,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "没有" @@ -13721,15 +13745,13 @@ msgstr "快速绘制(看起来较丑)" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "只提示重要的方向(例如单行道标签)。" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "只在路径的开头。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13876,34 +13898,39 @@ msgstr "GPS 点" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "绘出路径区段的方向提示。" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "绘出所有区段在其路径中的顺序编号。" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "在地图查看应用平滑化以产生较平滑的外观。" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "绘出从服务器下载数据的边界。" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "为了容易修改路径在选择模式中绘出虚拟节点。" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "将未使用的数据图层以不同的颜色绘制。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13911,5 +13938,5 @@ msgstr "这个选项会防止填满区域，并且会覆盖在选取样式中指定的任何数值。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM 数据" @@ -13985,5 +14012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:232 msgid "Add to slippymap chooser: " -msgstr "加入 slippymap 选择器r: " +msgstr "加入 slippymap 选择器: " #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:236 @@ -14256,5 +14283,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244 msgid "JOSM Internal Style" -msgstr "" +msgstr "JOSM 内部样式" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245 @@ -14264,9 +14291,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:249 msgid "Potlatch 2" -msgstr "" +msgstr "Potlatch 2" #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:250 msgid "the main Potlatch 2 style" -msgstr "" +msgstr "Potlatch 2 的主样式" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73 @@ -14890,5 +14917,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:332 msgid "The default preset for JOSM" -msgstr "" +msgstr "JOSM 的预设组合" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270 @@ -15199,4 +15226,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "检验" @@ -15351,10 +15379,10 @@ #, java-format msgid "Use preset ''{0}'' of group ''{1}''" -msgstr "" +msgstr "使用群组 \"{1}\" 中的预设组合 \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1069 #, java-format msgid "Use preset ''{0}''" -msgstr "" +msgstr "使用预设组合 \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1120 @@ -15838,7 +15866,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "服务器传回代码 404，以每个原型个别要求的方式重试。" @@ -15891,9 +15920,9 @@ msgstr "首选项 \"{0}\" 遗失。不能初始化 OsmApi。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "这个版本的 JOSM 与设定的服务器。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15902,21 +15931,21 @@ msgstr "它支持通讯协议版本 0.6，但服务器说它支持 {0} 到 {1} 版。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "使用 {1} 版协议建立与 {0} 的连接" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +msgstr "已删除图层 {0}，因为它不被配置的 API 所支持。" + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "服务器返回未预期的 id 格式，取得 \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15924,69 +15953,69 @@ msgstr "已修改原型 \"{0}\" 的新版本有未预期的格式。得到 \"{1}\"。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "正在建立修改集合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "成功的开放修改集合 {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "预期修改集合 ID > 0 。得到 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "正在更新修改集合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "正在更新修改集合 {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "正在关闭修改集合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "没有需要进行差异上传的修改集合。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "正在准备上传要求..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "等待 10 秒... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "{2} 秒内开始重试 {1} 次中的第 {0} 次 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - 再试一次。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "开始重试 {1} 次中的第 {0} 次。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "目前的修改集合为 null。不能上传数据。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "目前的修改集合 ID 必须大于 0。目前的 ID 是 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17043,5 +17072,5 @@ #, java-format msgid "Plugin provided by an external source: {0}" -msgstr "" +msgstr "插件由外部来源提供: {0}" #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42 @@ -17595,5 +17624,5 @@ msgstr "错误发生于列 " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "丢失的音频文件" @@ -18128,5 +18157,5 @@ "Tries to guess address data by picking the name of the closest object with " "according tag." -msgstr "" +msgstr "尝试通过最近对象中的相关标签，来猜测出地址数据。" #. Launch address guessing thread @@ -19535,5 +19564,5 @@ #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:40 msgid "Contour Merge" -msgstr "" +msgstr "轮廓合并" #. name @@ -19541,13 +19570,13 @@ #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:42 msgid "Merge the contour of an area with the contour of another area" -msgstr "" +msgstr "将区域的轮廓与另一个区域的轮廓合并" #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:153 msgid "Drag/drop: drag the way segment an drop it on a target segment" -msgstr "" +msgstr "拖/放：拖曳路径区段并将它放到目标区段上" #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:159 msgid "Left-Click: deselect node" -msgstr "" +msgstr "左击: 取消选取节点" #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:163 @@ -19563,9 +19592,9 @@ #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:221 msgid "Drag the way segment and drop it on a target segment" -msgstr "" +msgstr "拖曳路径区段并将它放到目标区段上" #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:229 msgid "Drop to align to the the target segment" -msgstr "" +msgstr "拖放以对齐目标区段" #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:258 @@ -19573,7 +19602,7 @@ msgstr "左击: 选择/取消选择节点; 拖动: 拖动路径片段" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" -msgstr "" +msgstr "合并轮廓" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:40 @@ -19601,9 +19630,9 @@ #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113 msgid "Coordinates imported: " -msgstr "输入的坐标： " +msgstr "输入的坐标: " #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113 msgid "Format errors: " -msgstr "格式错误： " +msgstr "格式错误: " #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115 @@ -19720,10 +19749,10 @@ #, java-format msgid "exttool:{0}" -msgstr "" +msgstr "外部工具:{0}" #: ../plugins/ext_tools/src/ext_tools/ExtToolAction.java:24 #, java-format msgid "External Tool: {0}" -msgstr "" +msgstr "外部工具: {0}" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46 @@ -19828,4 +19857,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20064,5 +20094,5 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:68 msgid "this layer is no osm data layer" -msgstr "" +msgstr "这个图层是不是 OSM 数据图层" #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:81 @@ -20202,5 +20232,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100 msgid "The starting location was not within the bbox" -msgstr "开始的位置不在 bbox 内" +msgstr "开始的位置不在限定窗口内" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105 @@ -20522,5 +20552,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "打开 MapDust" @@ -20624,4 +20654,8 @@ msgstr "选取的路径中之一已经是另一个多重多边形的一部分。" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20818,22 +20852,22 @@ msgstr "Firefox 可执行文件" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "变形错误: 最小 X 必须小于最大值" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "变形错误: 最小 Y 必须小于最大值" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "变形错误: 点太过靠近" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "变形错误: 不支持的变体。" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "变形错误: 不支持的方向" @@ -20845,5 +20879,5 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238 msgid "Select projection..." -msgstr "" +msgstr "选择投影方法..." #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:243 @@ -20930,5 +20964,5 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:361 msgid "Bottom left (min) corner:" -msgstr "" +msgstr "左下(最小)角:" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:363 @@ -20948,13 +20982,13 @@ #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:431 msgid "Projection Preferences" -msgstr "" +msgstr "投影方法首选项" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:478 msgid "Close the dialog and apply projection preferences" -msgstr "" +msgstr "关闭对话框，并应用更改投影方法首选项" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:491 msgid "Close the dialog, discard projection preference changes" -msgstr "" +msgstr "关闭对话框，并取消更改投影方法首选项" #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:544 @@ -21471,4 +21505,14 @@ msgid "Waypoints" msgstr "路标" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "关系编辑器：排序" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -21753,5 +21797,5 @@ #, java-format msgid "The script file ''{0}'' isn''t readable." -msgstr "" +msgstr "脚本文件 \"{0}\" 不可读取" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:237 @@ -21762,5 +21806,5 @@ #, java-format msgid "Failed to read the script from the file ''{0}''." -msgstr "从文件 “{0}\" 中读取脚本失败。" +msgstr "从文件 \"{0}\" 中读取脚本失败。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:247 @@ -21771,5 +21815,5 @@ #, java-format msgid "Failed to read a macro from the file ''{0}''." -msgstr "从文件 “{0}\" 中读取宏失败。" +msgstr "从文件 \"{0}\" 中读取宏失败。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:258 @@ -21791,8 +21835,10 @@ "to install a scripting engine with JOSM.

    " msgstr "" +"

    脚本不能执行，因为目前没有安装脚本引擎。

    请参考在线帮助，以了解如何" +"在 JOSM 安装脚本引擎的信息。

    " #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:277 msgid "No script engine" -msgstr "" +msgstr "没有脚本引擎" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:346 @@ -21810,9 +21856,9 @@ #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:56 msgid "Warning: failed to load mime types from file ''0''." -msgstr "" +msgstr "警告: 无法从文件 \"{0}\" 中载入 MIME 类型。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:65 msgid "Warning: failed to load default mime types from resource ''0''." -msgstr "" +msgstr "警告: 无法从来源 \"{0}\" 中载入默认 MIME 类型。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:94 @@ -21831,9 +21877,9 @@ #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:35 msgid "Scripting" -msgstr "" +msgstr "脚本" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:21 msgid "Configure..." -msgstr "" +msgstr "设定..." #. title @@ -21841,28 +21887,28 @@ #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:23 msgid "Configure scripting preferences" -msgstr "" +msgstr "设定脚本首选项" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:28 msgid "Script engines" -msgstr "" +msgstr "脚本引擎" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:34 msgid "Configure script engines and scripts" -msgstr "" +msgstr "设定脚本引擎和脚本" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:32 #, java-format msgid "''{0}'' doesn''t exist." -msgstr "" +msgstr "\"{0}\" 不存在。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:37 #, java-format msgid "''{0}'' is a directory. Expecting a jar file instead." -msgstr "" +msgstr "\"{0}\" 是一个目录。预期应该是一个 jar 档案。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:41 #, java-format msgid "''{0}'' isn't readable. Can''t load a script engine from this file." -msgstr "" +msgstr "\"{0}\" 不可读。不能从这个文件载入脚本引擎。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:48 @@ -21871,5 +21917,5 @@ "Failed to open file ''{0}'' as jar file. Can''t load a script engine from " "this file" -msgstr "" +msgstr "无法将文件 \"{0}\" 作为 jar 文件打开。不能从这个档案载入脚本引擎" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:53 @@ -21878,41 +21924,41 @@ "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' is " "missing." -msgstr "" +msgstr "jar 文件 \"{0}\" 不能提供脚本引擎。缺少项目 \"{1}\"。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:80 msgid "JAR files" -msgstr "" +msgstr "JAR 文件" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:89 msgid "Enter additional JAR files which provide script engines." -msgstr "" +msgstr "输入提供脚本引擎的额外 JAR 文件。" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:135 msgid "Available script engines" -msgstr "" +msgstr "可用的脚本引擎" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:143 msgid "JOSM currently supports the following script engines:" -msgstr "" +msgstr "JOSM 目前支持下列脚本引擎:" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:203 msgid "JAR file" -msgstr "" +msgstr "JAR 文件" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:285 msgid "Remove the selected jar files" -msgstr "" +msgstr "移除选取的 jar 文件" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:309 msgid "Add a jar file providing a script engine" -msgstr "" +msgstr "添加提供脚本引擎的 jar 文件" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:393 msgid "Launch file chooser" -msgstr "" +msgstr "执行文件选取器" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:404 msgid "Select a jar file" -msgstr "" +msgstr "选择一个 jar 文件" #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:26 @@ -22312,9 +22358,9 @@ #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39 msgid "KeyID" -msgstr "" +msgstr "KeyID" #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39 msgid "OSM-Info" -msgstr "" +msgstr "OSM-信息" #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39 @@ -22615,4 +22661,60 @@ msgstr "" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22812,13 +22914,4 @@ "这个转弯限制已经在编辑器之外被改变了。
    您不能应用您的修改并继续编" "辑。

    您是否要建立一个冲突并关闭这个编辑器?" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." -msgstr "" -"html>图层 \"{0}\" 已经有冲突于对象
    \"{1}\"。
    请先调解这个冲突，然后再试" -"一次。" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 @@ -23380,5 +23473,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57 msgid "A way is required instead." -msgstr "" +msgstr "需要路径代替。" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63 @@ -23454,17 +23547,17 @@ #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:49 msgid "Select Way Nodes" -msgstr "" +msgstr "选择路径节点" #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:48 msgid "Select all nodes of a selected way." -msgstr "" +msgstr "选择选取路径的所有节点。" #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43 msgid "Split Object" -msgstr "" +msgstr "分割对象" #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43 msgid "Split an object at the selected nodes." -msgstr "" +msgstr "将对象在选取的节点分割。" #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:64 @@ -23474,5 +23567,5 @@ #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:140 msgid "The selected way is not closed." -msgstr "" +msgstr "选取的路径尚未封闭。" #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:149 @@ -23927,5 +24020,5 @@ msgctxt "Place type" msgid "city" -msgstr "" +msgstr "市" #. relation place type @@ -23933,5 +24026,5 @@ msgctxt "Place type" msgid "locality" -msgstr "" +msgstr "地区" #. relation place type @@ -23939,5 +24032,5 @@ msgctxt "Place type" msgid "village" -msgstr "" +msgstr "村" #. relation place type @@ -23945,5 +24038,5 @@ msgctxt "Place type" msgid "town" -msgstr "" +msgstr "镇" #. relation place type @@ -23951,5 +24044,5 @@ msgctxt "Place type" msgid "borough" -msgstr "" +msgstr "镇区" #. relation place type @@ -23963,5 +24056,5 @@ msgctxt "Place type" msgid "island" -msgstr "" +msgstr "岛" #. relation place type @@ -23981,5 +24074,5 @@ msgctxt "Place type" msgid "suburb" -msgstr "" +msgstr "郊区" #. Strings in JFileChooser @@ -24250,5 +24343,5 @@ #: build/trans_plugins.java:16 msgid "Merges the contours of two areas" -msgstr "" +msgstr "合并两个区域的轮廓" #. Plugin Create_grid_of_ways @@ -24296,5 +24389,5 @@ #: build/trans_plugins.java:32 msgid "Shows the elevation profile and some statistical data of a GPX track." -msgstr "" +msgstr "显示 GPX 轨迹的海拔设定和一些统计资料。" #. Plugin epsg31287 @@ -24308,5 +24401,5 @@ #: build/trans_plugins.java:38 msgid "Finds and fixes invalid street addresses in a comfortable way." -msgstr "" +msgstr "寻找并以适当的方式来修正无效的街道地址。" #. Plugin globalsat @@ -24318,5 +24411,5 @@ #: build/trans_plugins.java:42 msgid "Allows to filter out unnececary GPS tracks" -msgstr "" +msgstr "允许过滤掉不需要的 GPS 轨迹" #. Plugin graphview @@ -24328,5 +24421,5 @@ #: build/trans_plugins.java:46 msgid "WMSPlugin-style imagery adjustment mapmode" -msgstr "" +msgstr "WMSPlugin-样式图片调整地图模式" #. Plugin ImageWayPoint @@ -24394,6 +24487,11 @@ msgstr "简单地把区域转换为多重多边形。" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24405,15 +24503,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "扩展 opening_hours 的编辑选项" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "导入 OpenStreetBugs 的议题" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24421,5 +24519,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24427,10 +24525,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "导入 PDF 文件并转换为路径。" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24440,5 +24538,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24447,15 +24545,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "超棒的 JGoodies 塑胶外观与感觉。" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24463,20 +24561,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." -msgstr "" +msgstr "添加 "重新启动 JOSM" 项目到文件菜单。" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "还原修改集合的插件" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "使用 rgis.spb.ru 图片做为覆盖" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24488,5 +24586,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24497,15 +24595,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "提供路线规画的功能。" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." -msgstr "" +msgstr "允许在 JOSM 中执行脚本。" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24517,20 +24615,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "建立并编辑 OpenSeaMap 海图" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "允许在目前的 gps 位置加入标记/节点。" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "提供在表格线中编辑标签的对话框。" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24542,15 +24640,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "让连栋房屋能超出单一区块。" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "建立并编辑 OpenSeaMap 海上航标" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24559,5 +24657,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24566,10 +24664,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" +msgstr "用来数字签名OSM-数据的插件" + +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." msgstr "" #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24579,15 +24683,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" -msgstr "允许从 OSM 数据库中取消删除的对象" +msgstr "允许从 OSM 数据库中取消删除对象" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." -msgstr "" +msgstr "许多让您的生活更轻松的公用程序。" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24599,5 +24703,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24608,24 +24712,24 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "方便的下载一整组互相联结的路径" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "为从 GPX 文件导入的路点开启搜索功能。" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "选择一整列无分支的路径" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " "behind." -msgstr "在航照图上将一辆赛车从 A 点开到 B 点，不管 cacti。" +msgstr "在航拍图上将一辆赛车从 A 点开到 B 点，不管后面的仙人掌。" #. @@ -26552,5 +26656,5 @@ #: build/trans_presets.java:441 msgid "Min. speed (km/h)" -msgstr "最低限速 (km/h)" +msgstr "最低速度 (km/h)" #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)" @@ -26558,25 +26662,25 @@ #: build/trans_presets.java:442 build/trans_presets.java:482 msgid "Max. weight (tonnes)" -msgstr "总重限制 (吨)" +msgstr "最大重量 (吨)" #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)" #: build/trans_presets.java:443 msgid "Max. axleload (tonnes)" -msgstr "" +msgstr "最大轴重 (吨)" #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)" #: build/trans_presets.java:444 msgid "Max. Height (meters)" -msgstr "高度限制 (米)" +msgstr "最高高度 (米)" #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)" #: build/trans_presets.java:445 msgid "Max. Width (meters)" -msgstr "宽度限制 (米)" +msgstr "最大宽度 (米)" #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)" #: build/trans_presets.java:446 msgid "Max. Length (meters)" -msgstr "长度限制 (米)" +msgstr "最长长度 (米)" #. @@ -26792,15 +26896,15 @@ #: build/trans_presets.java:477 msgid "viaduct" -msgstr "" +msgstr "旱桥" #. item "Highways/Streets/Bridge" combo "Bridge" display value #: build/trans_presets.java:477 msgid "swing" -msgstr "" +msgstr "吊桥" #. item "Highways/Streets/Bridge" combo "Bridge" display value #: build/trans_presets.java:477 msgid "aqueduct" -msgstr "" +msgstr "渠桥" #. item "Highways/Streets/Tunnel" label "Edit Tunnel" @@ -26884,35 +26988,35 @@ #: build/trans_presets.java:534 msgid "T1 - hiking trail" -msgstr "" +msgstr "T1 - 步道" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T2 - mountain hiking trail" -msgstr "" +msgstr "T2 - 登山步道" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T3 - difficult, exposed hiking trail" -msgstr "" +msgstr "T3 - 艰难，裸露步道" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T4 - difficult, exposed, steep alpine trail" -msgstr "" +msgstr "T4 - 艰难，裸露，陡峭的高山步道" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T5 - difficult alpine trail with climbing" -msgstr "" +msgstr "T5 - 艰难的攀登高山步道" #. item "Ways/Path" combo "SAC Scale" display value #: build/trans_presets.java:534 msgid "T6 - hazardous alpine trail with climbing" -msgstr "" +msgstr "T6 - 危险的攀登高山步道" #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description #: build/trans_presets.java:535 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard" -msgstr "" +msgstr "步道清理的很好。地面平坦或略有倾斜，没有摔伤的危险" #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description @@ -26966,10 +27070,10 @@ #: build/trans_presets.java:543 build/trans_presets.java:2714 msgid "intermediate" -msgstr "中级" +msgstr "中等" #. item "Ways/Path" combo "Visibility" display value #: build/trans_presets.java:543 msgid "bad" -msgstr "差" +msgstr "较差" #. item "Ways/Path" combo "Visibility" display value @@ -40043,4 +40147,344 @@ msgstr "测试" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "缩写的街道名称" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "节点上有单行道标签" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "节点上有桥梁标签" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "节点上错误的公路标签" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "未标名的未分类道路" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "没有编号的公路" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "临时公路标签" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "拼错的键名" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "带有标签 bicycle 的自行车道" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "带有标签 foot 的步道" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "用于路径的障碍物" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "用于步道的限速标签" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "有 + 号的图层标签" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "街道名称包含 ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "没有类型的关系" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "没有名称的餐馆" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "不常见的标签组合" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "Landsat" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "Landsat (镜像)" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "开放航空图" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "捷克 CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "捷克 UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "英国地形测量局新大众版 (NPE) 地图" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "到 {0} 个原型" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "取消删除 {0} 个原型" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
    ''{1}''." +#~ "
    Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "图层 \"{0}\" 已经有冲突于原型
    \"{1}\"。
    请先调解这个冲突，然后" +#~ "再试一次。\"" + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "" +#~ "警告：原型 \"{0}\" 已在服务器上删除了。正跳过这个原型并尝试重新上传。" + #~ msgid "Do not show again" #~ msgstr "以后不要再显示" @@ -40417,9 +40861,4 @@ #~ msgid "" -#~ "The child relation
    {0}
    is deleted on the server. It cannot be " -#~ "loaded" -#~ msgstr "子关系
    {0}
    已在服务器中删除。它已无法载入" - -#~ msgid "" #~ "There is at least one member in this relation referring
    to the " #~ "relation itself.
    This creates circular dependencies and is discouraged." @@ -40451,4 +40890,7 @@ #~ "图层 \"{0}\" 已经有冲突于原型
    \"{1}\"。
    请先调解这个冲突，然" #~ "后再试一次。" + +#~ msgid "Click do download the currently selected area" +#~ msgstr "点击以下载目前选取的区域" #~ msgid "" @@ -41177,34 +41619,4 @@ #~ msgstr "便利设施" -#~ msgid "abbreviated street name" -#~ msgstr "缩写的街道名称" - -#~ msgid "oneway tag on a node" -#~ msgstr "节点上有单行道标签" - -#~ msgid "bridge tag on a node" -#~ msgstr "节点上有桥梁标签" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "节点上错误的公路标签" - -#~ msgid "misspelled key name" -#~ msgstr "拼错的键名" - -#~ msgid "Open Aerial Map" -#~ msgstr "开放航空图" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - #~ msgid "Man-Made" #~ msgstr "人造" @@ -41219,4 +41631,9 @@ #~ msgid "" +#~ "The child relation
    {0}
    is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "子关系
    {0}
    已在服务器中删除。它已无法载入" + +#~ msgid "" #~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}" #~ msgstr "警告：从 \"{0}\" 解析 Mappaint 样式失败。例外为：{1}" @@ -41224,7 +41641,4 @@ #~ msgid "Building tag:" #~ msgstr "建筑物标签:" - -#~ msgid "Unnamed unclassified highway" -#~ msgstr "未标名的未分类道路" #~ msgid "" @@ -41249,4 +41663,19 @@ #~ "改变选择区域" +#~ msgid "" +#~ "

    Help content for help topic missing

    Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

    " +#~ msgstr "" +#~ "

    缺少帮助主题的内容

    帮助主题的内容 {0} 尚不能取得。不管是您" +#~ "当地语言 ({1}) 或是英语版本都没有。

    请帮助改进 JOSM 帮助系统并填好" +#~ "缺少的信息。您可以编辑将帮助主题编辑为当地的语言 ({1}) 和 英语版本。

    " + #~ msgid "Used style" #~ msgstr "用户样式" @@ -41260,7 +41689,4 @@ #~ msgid "standard" #~ msgstr "标准" - -#~ msgid "Landsat" -#~ msgstr "Landsat" #~ msgid "Desc" @@ -41326,16 +41752,4 @@ #~ msgstr "地上" -#~ msgid "footway with tag foot" -#~ msgstr "带有标签 foot 的步道" - -#~ msgid "temporary highway type" -#~ msgstr "临时公路标签" - -#~ msgid "cycleway with tag bicycle" -#~ msgstr "带有标签 bicycle 的自行车道" - -#~ msgid "NPE Maps" -#~ msgstr "英国地形测量局新大众版 (NPE) 地图" - #~ msgid "Only up to two areas can be joined at the moment." #~ msgstr "目前只能连接两个区域。" @@ -41343,16 +41757,4 @@ #~ msgid "With kiosk" #~ msgstr "有售货亭" - -#~ msgid "highway without a reference" -#~ msgstr "没有编号的公路" - -#~ msgid "barrier used on a way" -#~ msgstr "用于路径的障碍物" - -#~ msgid "maxspeed used for footway" -#~ msgstr "用于步道的限速标签" - -#~ msgid "Landsat (mirror)" -#~ msgstr "Landsat (镜像)" #~ msgid "Could not initialize remote control." @@ -41384,4 +41786,7 @@ #~ msgid "Child script have returned invalid data." #~ msgstr "子脚本返回了无效的数据。" + +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "在浏览器中启动选定对象的维基帮助页" #~ msgid "Allow remote control (reqires remotecontrol plugin)" @@ -41430,24 +41835,6 @@ #~ msgstr "{0}: 远程控制有问题" -#~ msgid "layer tag with + sign" -#~ msgstr "有 + 号的图层标签" - -#~ msgid "street name contains ss" -#~ msgstr "街道名称包含 ss" - -#~ msgid "relation without type" -#~ msgstr "没有类型的关系" - -#~ msgid "restaurant without name" -#~ msgstr "没有名称的餐馆" - -#~ msgid "unusual tag combination" -#~ msgstr "不常见的标签组合" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "捷克 CUZK:KM" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "捷克 UHUL:ORTOFOTO" +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "只提示重要的方向(例如单行道标签)。" #~ msgid "Enable built-in defaults" @@ -41716,2 +42103,9 @@ #~ msgid "Internal Style" #~ msgstr "内部样式" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "不论 {0} 或 {1} 都没有启用。
    请" +#~ "选择下载 OSM 数据，或 GPX 数据，或两个都选。" Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 25650) +++ /applications/editors/josm/i18n/po/zh_TW.po (revision 25651) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 16:33+0100\n" +"POT-Creation-Date: 2011-03-20 22:11+0100\n" "PO-Revision-Date: 2011-03-05 09:23+0000\n" "Last-Translator: Chao-Hsiung Liao \n" @@ -16,16 +16,16 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-03-06 15:13+0000\n" -"X-Generator: Launchpad (build 12515)\n" +"X-Launchpad-Export-Date: 2011-03-20 17:14+0000\n" +"X-Generator: Launchpad (build 12617)\n" "Language: zh_TW\n" #. FIXME why is help not a JosmAction? #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/Main.java:235 +#: ../core/src/org/openstreetmap/josm/Main.java:233 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -35,12 +35,12 @@ msgstr "說明" -#: ../core/src/org/openstreetmap/josm/Main.java:475 +#: ../core/src/org/openstreetmap/josm/Main.java:473 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "忽略格式不良的檔案 URL： \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:476 -#: ../core/src/org/openstreetmap/josm/Main.java:509 -#: ../core/src/org/openstreetmap/josm/Main.java:596 +#: ../core/src/org/openstreetmap/josm/Main.java:474 +#: ../core/src/org/openstreetmap/josm/Main.java:507 +#: ../core/src/org/openstreetmap/josm/Main.java:594 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -76,7 +76,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 @@ -109,14 +109,14 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:508 +#: ../core/src/org/openstreetmap/josm/Main.java:506 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "參數「downloadgps」不能使用檔案名稱或檔案 URL" -#: ../core/src/org/openstreetmap/josm/Main.java:595 +#: ../core/src/org/openstreetmap/josm/Main.java:593 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "忽略不正確的 URL: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:746 +#: ../core/src/org/openstreetmap/josm/Main.java:744 #, java-format msgid "" @@ -129,13 +129,13 @@ "本。更多資訊：" -#: ../core/src/org/openstreetmap/josm/Main.java:761 +#: ../core/src/org/openstreetmap/josm/Main.java:759 msgid "Exit JOSM" msgstr "結束 JOSM" -#: ../core/src/org/openstreetmap/josm/Main.java:762 +#: ../core/src/org/openstreetmap/josm/Main.java:760 msgid "Continue, try anyway" msgstr "繼續，強制再試一次" -#: ../core/src/org/openstreetmap/josm/Main.java:763 +#: ../core/src/org/openstreetmap/josm/Main.java:761 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 @@ -156,4 +156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535 @@ -195,18 +196,18 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 @@ -225,4 +226,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116 msgid "About" msgstr "關於" @@ -309,8 +312,8 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44 -#, java-format +#, fuzzy, java-format msgid "" "WARNING: unexpected format of API base URL. Redirection to info or history " -"page for OSM primitive will probably fail. API base URL is: ''{0}''" +"page for OSM object will probably fail. API base URL is: ''{0}''" msgstr "" "警告：未預期的 API 基礎 URL 格式。重新導向至 OSM 原型的資訊或歷史紀錄頁面可能" @@ -414,4 +417,5 @@ #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490 @@ -494,5 +498,5 @@ #: ../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/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23 @@ -581,6 +585,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253 @@ -623,51 +627,51 @@ msgstr "請至少選取三個節點" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 msgid "data" msgstr "資料" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 msgid "layer" msgstr "圖層" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 msgid "selection" msgstr "選取" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61 msgid "conflict" msgstr "衝突" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "download" msgstr "下載" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "previous" msgstr "上一級" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39 msgid "next" msgstr "下一級" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "Nothing selected to zoom to." msgstr "沒有選擇要縮放的物件。" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #, java-format msgid "Zoom to {0}" msgstr "縮放至 {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 #, java-format msgid "Zoom the view to {0}." msgstr "將檢視縮放至 {0}。" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22 @@ -677,5 +681,5 @@ msgstr "檢視：{0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214 msgid "No conflicts to zoom to" msgstr "沒有要縮放的衝突" @@ -973,9 +977,10 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 -msgid "Download primitives referring to one of the selected primitives" +#, fuzzy +msgid "Download objects referring to one of the selected objects" msgstr "下載參照到已選取原型中之一的原型" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695 @@ -984,5 +989,5 @@ msgstr "重製" -#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20 +#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 msgid "Duplicate selection by copy and immediate paste." msgstr "重製會複製選擇區域並立即貼上。" @@ -1090,5 +1095,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692 @@ -1443,5 +1448,6 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22 -msgid "Merge the currently selected primitives into another layer" +#, fuzzy +msgid "Merge the currently selected objects into another layer" msgstr "將目前選取的原型合併到另一個圖層" @@ -1711,8 +1717,9 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156 -msgid "" -"The copied data contains incomplete primitives. When pasting the incomplete " -"primitives are removed. Do you want to paste the data without the " -"incomplete primitives?" +#, fuzzy +msgid "" +"The copied data contains incomplete objects. When pasting the incomplete " +"objects are removed. Do you want to paste the data without the incomplete " +"objects?" msgstr "" "複製的資料含有不完整的原型。當貼上的時候不完整的原型會被移除。您確定要貼上含" @@ -1736,8 +1743,8 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256 -#, java-format -msgid "to {0} primitive" -msgid_plural "to {0} primtives" -msgstr[0] "到 {0} 個原型" +#, fuzzy, java-format +msgid "to {0} object" +msgid_plural "to {0} objects" +msgstr[0] "刪除 {0} 個物件" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25 @@ -1852,4 +1859,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325 +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240 @@ -2757,5 +2765,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180 @@ -2763,4 +2771,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784 msgid "Select" @@ -3375,7 +3384,7 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''.
    This " +#, fuzzy, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    This " "conflict cannot be added." msgstr "" @@ -3389,8 +3398,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 -#, java-format +#, fuzzy, java-format msgid "" "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for " -"primitive ''{1}''." +"object ''{1}''." msgstr "警告：圖層「{0}」已不存在。不能移除原型「{1}」的衝突。" @@ -3590,8 +3599,8 @@ #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 -#, java-format -msgid "Undelete {0} primitive" -msgid_plural "Undelete {0} primitives" -msgstr[0] "取消刪除 {0} 個原型" +#, fuzzy, java-format +msgid "Undelete {0} object" +msgid_plural "Undelete {0} objects" +msgstr[0] "刪除 {0} 個物件" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38 @@ -3891,5 +3900,5 @@ msgstr "不在快取中" -#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70 +#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76 #, java-format msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable" @@ -3949,8 +3958,9 @@ msgstr "缺少 id {1} 類型 {0} 的合併目標" -#. Same version, but different "visible" attribute. It indicates a serious problem in datasets. +#. Same version, but different "visible" attribute and neither of them are modified. +#. It indicates a serious problem in datasets. #. For example, datasets can be fetched from different OSM servers or badly hand-modified. #. We shouldn't merge that datasets. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316 #, java-format msgid "Conflict in 'visible' attribute for object of type {0} with id {1}" @@ -4101,5 +4111,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 msgid "background" msgstr "背景" @@ -4800,5 +4810,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 @@ -4812,4 +4822,5 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219 msgid "Edit" @@ -5307,6 +5318,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format msgid "{0} node" @@ -5422,5 +5433,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 msgid "Imagery" msgstr "圖片" @@ -5664,5 +5675,5 @@ msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -5670,10 +5681,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180 #: build/specialmessages.java:87 msgid "View" msgstr "檢視" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26 @@ -5681,5 +5692,5 @@ msgstr "工具" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -5687,5 +5698,5 @@ msgstr "預設組合" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58 @@ -5696,5 +5707,5 @@ msgstr "選單：{0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344 msgid "Audio" msgstr "音效" @@ -6088,11 +6099,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -msgid "" -"The following primitives could not be copied to the target " -"primitive
    because they are deleted in the target dataset:" +#, fuzzy +msgid "" +"The following objects could not be copied to the target object
    because " +"they are deleted in the target dataset:" msgstr "下列原型無法複製到目標原型，
    因為它們已經在目標資料組合中被刪除了：" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 -msgid "Merging deleted primitives failed" +#, fuzzy +msgid "Merging deleted objects failed" msgstr "合併刪除的原型失敗" @@ -6344,8 +6357,10 @@ msgstr "參照於：" +#. #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120 msgid "(none)" msgstr "（沒有）" @@ -6385,5 +6400,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 msgid "Primitive" msgstr "原型" @@ -6616,6 +6630,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "{0} way" @@ -6625,5 +6639,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442 #, java-format msgid "{0} relation" @@ -6818,5 +6832,4 @@ msgstr "開啟所有指令的清單 (復原緩衝區)。" -#. create MapDust GUI #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116 @@ -6827,5 +6840,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541 @@ -6833,7 +6846,8 @@ #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46 -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188 @@ -6864,13 +6878,13 @@ msgstr "衝突：{0} 未調解" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342 msgid "Open a merge dialog of all selected items in the list above." msgstr "開啟上列清單所有選取的項目的合併對話盒。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115 @@ -7462,11 +7476,11 @@ msgstr "點選以最小化/最大化面板內容" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164 msgid "Authors" msgstr "作者" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 msgid "Open a list of people working on the selected objects." msgstr "開啟在編輯選取物件的使用者的清單。" @@ -7479,5 +7493,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 -msgid "Select primitives submitted by this user" +#, fuzzy +msgid "Select objects submitted by this user" msgstr "選擇由這個使用者提交的原型" @@ -7547,4 +7562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 msgid "Fix" msgstr "修正" @@ -7768,5 +7784,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 -msgid "Download and show the history of the selected primitives" +#, fuzzy +msgid "Download and show the history of the selected objects" msgstr "下載並顯示選取原型的歷史紀錄" @@ -7802,5 +7819,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379 -msgid "Zoom to the corresponding primitives in the current data layer" +#, fuzzy +msgid "Zoom to the corresponding objects in the current data layer" msgstr "縮放到目前資料圖層對應的原型" @@ -8934,6 +8952,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417 -msgid "" -"Zoom to the primitives in the content of this changeset in the current data " +#, fuzzy +msgid "" +"Zoom to the objects in the content of this changeset in the current data " "layer" msgstr "縮放到目前資料圖層這個變更組合的內容的原型" @@ -9420,6 +9439,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 -msgid "Launch browser with wiki help to selected object" -msgstr "執行瀏覽器取得選取物件的 wiki 說明" +msgid "Launch browser with wiki help for selected object" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154 @@ -9471,6 +9490,6 @@ msgid "" "The child relation
    {0}
    is deleted on the server. It cannot be " -"loaded" -msgstr "子關係
    {0}
    已在伺服器中刪除。它已無法載入" +"loaded" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 @@ -9556,8 +9575,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 -#, java-format +#, fuzzy, java-format msgid "" "This relation already has one or more members referring to
    the " -"primitive ''{0}''

    Do you really want to add another relation member?
    Do you really want to add another relation member?" msgstr "" @@ -9566,5 +9585,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681 -msgid "Multiple members referring to same primitive" +#, fuzzy +msgid "Multiple members referring to same object." msgstr "多個成員參照到同一原型" @@ -9580,27 +9600,30 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 -msgid "" -"Add all primitives selected in the current dataset before the first member" +#, fuzzy +msgid "Add all objects selected in the current dataset before the first member" msgstr "將目前資料組合中選取的所有原型加到第一個成員之前" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766 -msgid "" -"Add all primitives selected in the current dataset after the last member" +#, fuzzy +msgid "Add all objects selected in the current dataset after the last member" msgstr "將目前資料組合中選取的所有原型加到最後一個成員之後" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 -msgid "" -"Add all primitives selected in the current dataset before the first selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset before the first selected " "member" msgstr "將目前資料組合中選取的所有原型加到第一個選取的成員之前" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -msgid "" -"Add all primitives selected in the current dataset after the last selected " +#, fuzzy +msgid "" +"Add all objects selected in the current dataset after the last selected " "member" msgstr "將目前資料組合中選取的所有原型加到最後一個選取的成員之後" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859 -msgid "Remove all members referring to one of the selected primitives" +#, fuzzy +msgid "Remove all members referring to one of the selected objects" msgstr "移除所有參照到選取原型其中之一的成員" @@ -9612,17 +9635,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908 -msgid "" -"Select relation members which refer to primitives in the current selection" +#, fuzzy +msgid "Select relation members which refer to objects in the current selection" msgstr "選取參照到目前選取範圍的關係成員" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -#, java-format -msgid "" -"Select relation members which refer to {0} primitives in the current " -"selection" +#, fuzzy, java-format +msgid "" +"Select relation members which refer to {0} objects in the current selection" msgstr "選取參照到目前選取範圍 {0} 原型的關係成員" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 -msgid "Select primitives for selected relation members" +#, fuzzy +msgid "Select objects for selected relation members" msgstr "選擇已選取關係成員的原型" @@ -9719,10 +9742,11 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for primitive
    ''{1}''." -"
    Please resolve this conflict first, then try again." -msgstr "" -"圖層「{0}」已經有衝突於原型
    「{1}」。
    請先調解這個衝突，然後再試" +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 +#, java-format +msgid "" +"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " +"resolve this conflict first, then try again." +msgstr "" +"圖層「{0}」已經有衝突於物件
    「{1}」。
    請先調解這個衝突，然後再試" "一次。" @@ -9773,11 +9797,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 -#, java-format -msgid "You are setting an empty role on {0} primitive." -msgid_plural "You are setting an empty role on {0} primitives." +#, fuzzy, java-format +msgid "You are setting an empty role on {0} object." +msgid_plural "You are setting an empty role on {0} objects." msgstr[0] "您正在設定 {0} 個原型的空白角色。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386 -msgid "This is equal to deleting the roles of these primitives." +#, fuzzy +msgid "This is equal to deleting the roles of these objects." msgstr "這樣等同刪除這些原型的角色。" @@ -10057,6 +10082,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395 -msgid "Click do download the currently selected area" -msgstr "點選以下載目前選取的區域" +msgid "Click to download the currently selected area" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402 @@ -10068,8 +10093,6 @@ msgid "" "Neither {0} nor {1} is enabled." -"
    Please chose to either download OSM data, or GPX data, or both." -msgstr "" -"不論 {0} 或 {1} 都沒有啟用。
    請選" -"擇下載 OSM 資料，或 GPX 資料，或兩個都選。" +"
    Please choose to either download OSM data, or GPX data, or both." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74 @@ -10152,4 +10175,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/specialmessages.java:82 build/trans_presets.java:457 #: build/trans_presets.java:753 build/trans_presets.java:762 @@ -10234,5 +10258,6 @@ msgstr "JOSM 協助文件瀏覽器" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233 +#. i18n: do not translate "warning-header" and "warning-body" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234 #, java-format msgid "" @@ -10240,16 +10265,11 @@ "class=\"warning-body\">Help content for the help topic {0} " "is not available yet. It is missing both in your local language ({1}) and in " -"english.

    Please help to improve the JOSM help system and fill in the " +"English.

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

    " msgstr "" -"

    缺少求助主題的內容

    求助主題的內容{0}尚不能取得。不管是您當地語言 ({1}) " -"或是英語版本都沒有。

    請協助改進 JOSM 求助系統並填好缺少的資訊。您可以" -"編輯    將求助主題編輯為當地的語言 ({1}) 和 " -"英語版本。

    " - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255 + +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256 #, java-format msgid "" @@ -10263,5 +10283,5 @@ "
    {1}

    " -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356 #, java-format msgid "" @@ -10272,19 +10292,19 @@ "的網際網路連線" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361 msgid "Failed to open URL" msgstr "無法開啟 URL" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394 msgid "Open the current help page in an external browser" msgstr "在外部瀏覽器開啟目前的求助頁面" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406 msgid "Edit the current help page" msgstr "編輯目前的說明頁面" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416 #, java-format msgid "" @@ -10296,33 +10316,33 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438 msgid "Reload the current help page" msgstr "重新載入目前的說明頁面" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453 msgid "Go to the previous page" msgstr "回到上一頁" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473 msgid "Go to the next page" msgstr "前往下一頁" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489 msgid "Go to the JOSM help home page" msgstr "移至 JOSM 求助首頁" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520 #, java-format msgid "Warning: bad location in HTML document. Exception was: {0}" msgstr "警告：在 HTML 文件中有錯誤的位置。例外為：{0}" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 msgid "Failed to open help page. The target URL is empty." msgstr "無法開啟求助頁面。目標 URL 是空的。" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571 msgid "Failed to open help page" msgstr "無法開啟說明頁面" @@ -10434,4 +10454,8 @@ msgid "Relation {0}" msgstr "關係 {0}" + +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26 +msgid "Object" +msgstr "物件" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -10549,5 +10573,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 msgid "Conflicts detected" msgstr "選取的衝突" @@ -11202,12 +11226,15 @@ #. #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94 -#, java-format -msgid "" -"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " -"primitive and retrying to upload." -msgstr "警告：原型「{0}」已在伺服器上刪除了。正略過這個原型並嘗試重新上傳。" +#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 +#, java-format +msgid "" +"Warning: object ''{0}'' is already deleted on the server. Skipping this " +"object and retrying to upload." +msgstr "" +"警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。" #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108 -msgid "Preparing primitives to upload ..." +#, fuzzy +msgid "Preparing objects to upload ..." msgstr "正在準備要上傳的原型 ..." @@ -11350,14 +11377,4 @@ msgstr "變更組合已滿" -#. we tried to delete an already deleted primitive. -#. -#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194 -#, java-format -msgid "" -"Warning: object ''{0}'' is already deleted on the server. Skipping this " -"object and retrying to upload." -msgstr "" -"警告：物件「{0}」已經在伺服器端被刪除了。現在略過這個物件並重新嘗試上傳。" - #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195 #, java-format @@ -11366,5 +11383,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462 #, java-format msgid "Uploading {0} object..." @@ -11558,4 +11575,5 @@ #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 #: build/trans_presets.java:4130 msgid "Description" @@ -11634,5 +11652,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148 @@ -11849,23 +11867,23 @@ msgstr "錯誤" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120 #, java-format msgid "Data Layer {0}" msgstr "資料圖層 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181 msgid "outside downloaded area" msgstr "超出下載的區域" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281 #, java-format msgid "version {0}" msgstr "版本 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355 #, java-format msgid "There was {0} conflict detected." @@ -11873,11 +11891,11 @@ msgstr[0] "偵測到 {0} 個衝突。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 msgid "Click to close this dialog and continue editing" msgstr "按這裡關閉這個對話盒並繼續編輯" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444 #, java-format msgid "{0} deleted" @@ -11885,32 +11903,32 @@ msgstr[0] "{0} 已刪除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447 #, java-format msgid "{0} consists of:" msgstr "{0} 組成：" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 msgid "unset" msgstr "取消設定" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451 #, java-format msgid "API version: {0}" msgstr "API 版本： {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145 msgid "Convert to GPX layer" msgstr "轉換為 GPX 圖層" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648 msgid "Dataset consistency test" msgstr "資料組合一致性測試" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654 msgid "No problems found" msgstr "沒有發現問題" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657 msgid "Following problems found:" msgstr "發現下列問題：" @@ -12632,6 +12650,6 @@ #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77 #, java-format msgid "" @@ -12655,7 +12673,7 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62 -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85 #, java-format msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}" @@ -12670,5 +12688,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80 +#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81 #, java-format msgid "" @@ -13614,4 +13632,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 msgid "None" msgstr "沒有" @@ -13728,15 +13747,13 @@ msgstr "快速繪製（看起來較醜）" -#. only interesting directions +#. only on the head of a way #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244 -msgid "Only interesting direction hints (e.g. with oneway tag)." -msgstr "只有重要的方向提示（例如單行道標籤）。" - -#. only on the head of a way -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241 msgid "Only on the head of a way." msgstr "只在路徑的開頭。" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55 +msgid "Draw oneway arrows." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56 @@ -13883,34 +13900,39 @@ msgstr "GPS 點" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236 msgid "Draw direction hints for way segments." msgstr "繪出路徑區段的方向提示。" +#. draw oneway arrows +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247 +msgid "Draw arrows in the direction of oneways and other directed features." +msgstr "" + #. segment order number -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw the order numbers of all segments within their way." msgstr "繪出所有區段在其路徑中的順序編號。" #. antialiasing -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257 msgid "Apply antialiasing to the map view resulting in a smoother appearance." msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。" #. downloaded area -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262 msgid "Draw the boundaries of data loaded from the server." msgstr "繪出從伺服器下載資料的邊界。" #. virtual nodes -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267 msgid "Draw virtual nodes in select mode for easy way modification." msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。" #. background layers in inactive color -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272 msgid "Draw the inactive data layers in a different color." msgstr "將未使用的資料圖層以不同的顏色繪製。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278 msgid "" "This option suppresses the filling of areas, overriding anything specified " @@ -13918,5 +13940,5 @@ msgstr "這個選項會防止填滿區域，並且會覆蓋在選取樣式中指定的任何數值。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288 +#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284 msgid "OSM Data" msgstr "OSM 資料" @@ -15196,4 +15218,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42 msgid "Validate" msgstr "檢驗" @@ -15835,7 +15858,8 @@ #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423 +#, fuzzy msgid "" "Server replied with response code 404, retrying with an individual request " -"for each primitive." +"for each object." msgstr "伺服器傳回代碼 404，以每個原型個別要求的方式重試。" @@ -15888,9 +15912,9 @@ msgstr "偏好設定「{0}」遺失。不能初始化 OsmApi。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 msgid "This version of JOSM is incompatible with the configured server." msgstr "這個版本的 JOSM 與設定的伺服器。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173 #, java-format msgid "" @@ -15899,21 +15923,21 @@ msgstr "它支援通訊協定版本 0.6，但伺服器說它支援 {0} 到 {1} 版。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177 #, java-format msgid "Communications with {0} established using protocol version {1}." msgstr "使用 {1} 版協定建立與 {0} 的連線" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203 #, java-format msgid "Removed layer {0} because it is not allowed by the configured API." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." msgstr "伺服器回覆未預期的 id 格式，取得「{0}」" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 #, java-format msgid "" @@ -15921,69 +15945,69 @@ msgstr "已修改原型「{0}」的新版本有未預期的格式。得到「{1}」。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347 msgid "Creating changeset..." msgstr "正在建立變更組合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357 #, java-format msgid "Successfully opened changeset {0}" msgstr "成功的開放變更組合 {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "預期變更組合 ID > 0 。得到 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383 msgid "Updating changeset..." msgstr "正在更新變更組合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 #, java-format msgid "Updating changeset {0}..." msgstr "正在更新變更組合 {0}..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423 msgid "Closing changeset..." msgstr "正在關閉變更組合..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446 msgid "No changeset present for diff upload." msgstr "沒有需要進行差異上傳的變更組合。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453 msgid "Preparing upload request..." msgstr "正在準備上傳要求..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483 msgid "Waiting 10 seconds ... " msgstr "等待 10 秒... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "{2} 秒內開始重試 {1} 次中的第 {0} 次 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494 msgid "OK - trying again." msgstr "OK - 再試一次。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580 #, java-format msgid "Starting retry {0} of {1}." msgstr "開始重試 {1} 次中的第 {0} 次。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676 msgid "Current changeset is null. Cannot upload data." msgstr "目前的變更組合為 null。不能上傳資料。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "目前的變更組合 ID 必須大於 0。目前的 ID 是 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -17593,5 +17617,5 @@ msgstr "錯誤發生於列 " -#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389 +#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390 msgid "Missing audio file" msgstr "缺少聲音檔案" @@ -19573,5 +19597,5 @@ msgstr "" -#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416 +#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415 msgid "Merging Contour" msgstr "合併輪廓" @@ -19828,4 +19852,5 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136 +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33 #: build/specialmessages.java:73 msgid "Refresh" @@ -20522,5 +20547,5 @@ msgstr "LiveGPS" -#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118 +#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126 msgid "Open MapDust" msgstr "開啟 MapDust" @@ -20624,4 +20649,8 @@ msgstr "選取的路徑中之一已經是另一個多重多邊形的一部分。" +#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109 +msgid "About Plugin" +msgstr "" + #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 msgid "OpenStreetBugs download loop" @@ -20818,22 +20847,22 @@ msgstr "Firefox 可執行檔" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 msgid "Transform error: Min X must be smaller than max" msgstr "變形錯誤：最小 X 必須小於最大值" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146 msgid "Transform error: Min Y must be smaller than max" msgstr "變形錯誤：最小 Y 必須小於最大值" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152 msgid "Transform error: Points too close" msgstr "變形錯誤：點太過靠近" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129 -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178 msgid "Transform error: Unsupported variant." msgstr "變形錯誤：不支援的變體。" -#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190 +#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226 msgid "Transform error: Unsupported orientation" msgstr "變形錯誤：不支援的方向" @@ -21471,4 +21500,14 @@ msgid "Waypoints" msgstr "路標" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36 +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38 +#, fuzzy +msgid "Open Relation Editor" +msgstr "關係編輯器：{0}" + +#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37 +msgid "Opens advanced relation/multipolygon editor panel" +msgstr "" #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17 @@ -22621,4 +22660,60 @@ msgstr "建立新的簽署金鑰" +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31 +msgid "Edit turn relations and lane lengths for selected node." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43 +msgid "Validate turn- and lane-length-relations for consistency." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Turn Lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68 +msgid "Edit turn lanes" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30 +msgid "Quick-Fix" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34 +msgid "Revalidate all turnlanes-relations." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43 +msgid "Automatically fixes the issue." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58 +msgid "Selects the offending relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135 +#, java-format +msgid "{0} lanes are not referenced in any turn-relation." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279 +msgid "Put the ways in order." +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372 +#, java-format +msgid "Relation references non-existent (regular) lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378 +#, java-format +msgid "Relation references non-existent extra lane {0}" +msgstr "" + +#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399 +#, java-format +msgid "Integer list \"{0}\" contains unexpected values." +msgstr "" + #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112 @@ -22816,13 +22911,4 @@ "這個轉彎限制已經在編輯器之外被改變了。
    您不能套用您的變更並繼續編" "輯。

    您是否要建立一個衝突並關閉這個編輯器？" - -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628 -#, java-format -msgid "" -"Layer ''{0}'' already has a conflict for object
    ''{1}''.
    Please " -"resolve this conflict first, then try again." -msgstr "" -"圖層「{0}」已經有衝突於物件
    「{1}」。
    請先調解這個衝突，然後再試" -"一次。" #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634 @@ -24392,6 +24478,11 @@ msgstr "只把區域轉換為多重多邊形。" +#. Plugin namemanager +#: build/trans_plugins.java:71 +msgid "Allows to attribute tags to all objects in any selected area at once" +msgstr "" + #. Plugin nearclick -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -24403,15 +24494,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "extended options for editing opening_hours" msgstr "用來編輯 opening_hours 的擴充選項" #. Plugin openstreetbugs -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "Imports issues from OpenStreetBugs" msgstr "匯入OpenStreetBugs 的議題" #. Plugin openvisible -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -24419,5 +24510,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -24425,10 +24516,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Import PDF file and convert to ways." msgstr "匯入 PDF 檔案並轉換為路徑。" #. Plugin photo_geotagging -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -24438,5 +24529,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -24445,15 +24536,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "The great JGoodies Plastic Look and Feel." msgstr "超棒的 JGoodies 塑膠外觀與感覺。" #. Plugin proj4j -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "adds projections from Proj4J" msgstr "" #. Plugin public_transport -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -24461,20 +24552,20 @@ #. Plugin restart -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Adds "Restart JOSM" item to File menu." msgstr "加入 "重新啟動 JOSM" 項目到檔案選單。" #. Plugin reverter -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "Plugin for reverting changesets" msgstr "還原變更組合的外掛程式" #. Plugin rgisopen -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "Use rgis.spb.ru image as overlay" msgstr "使用 rgis.spb.ru 圖片做為覆蓋" #. Plugin RoadSigns -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -24486,5 +24577,5 @@ #. Plugin routes -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -24495,15 +24586,15 @@ #. Plugin routing -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "Provides routing capabilities." msgstr "提供路線規畫的功能。" #. Plugin scripting -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "Allows to run scripts in JOSM." msgstr "允許在 JOSM 中執行命令稿。" #. Plugin SimplifyArea -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -24515,20 +24606,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:109 build/trans_plugins.java:111 +#: build/trans_plugins.java:111 build/trans_plugins.java:113 msgid "Create and edit seamaps for OpenSeaMap" msgstr "建立並編輯 OpenSeaMap 海圖" #. Plugin surveyor -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Allow adding markers/nodes on current gps positions." msgstr "允許在目前的 gps 位置加入標記/節點。" #. Plugin tageditor -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "提供在表格線中編輯標籤的對話盒。" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -24540,15 +24631,15 @@ #. Plugin terracer -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "Make terraced houses out of single blocks." msgstr "讓連棟房屋能超出單一區塊。" #. Plugin SeaMapEditor -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "Create and edit seamarks for OpenSeaMap" msgstr "建立並編輯 OpenSeaMap 海上航標" #. Plugin touchscreenhelper -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -24557,5 +24648,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -24564,10 +24655,16 @@ #. Plugin trustosm -#: build/trans_plugins.java:127 +#: build/trans_plugins.java:129 msgid "Plugin to digital sign OSM-Data" msgstr "用來數位簽署 OSM-Data 的外掛程式" +#. Plugin turnlanes +#: build/trans_plugins.java:131 +msgid "" +"Provides a straightforward GUI for adding, editing and deleting turn lanes." +msgstr "" + #. Plugin turnrestrictions -#: build/trans_plugins.java:129 +#: build/trans_plugins.java:133 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -24578,15 +24675,15 @@ #. Plugin undelete -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:135 msgid "Allows undeleting object from OSM database" msgstr "允許從 OSM 資料庫中取消物件的刪除" #. Plugin utilsplugin2 -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:137 msgid "Several utilities that make your life easier." msgstr "許多讓您的生活更便利的公用程式。" #. Plugin videomapping -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:139 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -24598,5 +24695,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:141 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -24607,20 +24704,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:143 msgid "Easy downloading along a long set of interconnected ways" msgstr "方便的下載一整組互相聯結的路徑" #. Plugin waypoint_search -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:145 msgid "Enables searching for waypoint imported from gpx file." msgstr "啟用搜尋從 gpx 檔案匯入的航點。" #. Plugin wayselector -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:147 msgid "Select a sequence of non-branching connected ways" msgstr "選擇非分支連接的路徑次序" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:149 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -40042,18 +40139,342 @@ msgstr "測試" -#~ msgid "bridge tag on a node" -#~ msgstr "節點上有橋樑標籤" - -#~ msgid "oneway tag on a node" -#~ msgstr "節點上有單行道標籤" - -#~ msgid "highway without a reference" -#~ msgstr "沒有編號參照的公路" - -#~ msgid "wrong highway tag on a node" -#~ msgstr "節點上錯誤的公路標籤" - -#~ msgid "misspelled key name" -#~ msgstr "拼錯的鍵名" +#. JOSM TagChecker validator file +#. Format: +#. Each line specifies a certain error to be reported +#. : messagetype : +#. +#. Data type can be: +#. node - a node point +#. way - a way +#. relation - a relation +#. * - all data types +#. +#. Message type can be: +#. E - an error +#. W - a warning +#. I - an low priority informational warning +#. +#. Key and value are expressions describing certain keys and values of these keys. +#. Regulator expressions are supported. In this case the expressions starts and +#. ends with // signs. If an 'i' is appended, the regular expression is +#. case insensitive. +#. +#. The * sign indicates any string. +#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special +#. handling for boolean values (yes, true, 0, false, no, ...). +#. +#. Expression can be: +#. != - the key/value combination does not match +#. == - the key/value combination does match +#. +#. To have more complicated expressions, multiple elements can be grouped together +#. with an logical and (&&). +#. +#. The comment at the end of a rule is displayed in validator description +#. +#. Empty lines and space signs are ignored +#. way : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i +#: build/trans_validator.java:38 +msgid "abbreviated street name" +msgstr "縮寫的街道名稱" + +#. node : W : oneway == * +#: build/trans_validator.java:40 +msgid "oneway tag on a node" +msgstr "節點上有單行道標籤" + +#. node : W : bridge == BOOLEAN_TRUE +#: build/trans_validator.java:41 +msgid "bridge tag on a node" +msgstr "節點上有橋樑標籤" + +#. node : W : highway == tertiary +#. node : W : highway == secondary +#. node : W : highway == residential +#. node : W : highway == unclassified +#. node : W : highway == track +#: build/trans_validator.java:42 build/trans_validator.java:43 +#: build/trans_validator.java:44 build/trans_validator.java:45 +#: build/trans_validator.java:46 +msgid "wrong highway tag on a node" +msgstr "節點上錯誤的公路標籤" + +#. way : I : highway == unclassified && name != * +#: build/trans_validator.java:47 +msgid "Unnamed unclassified highway" +msgstr "未命名未分類道路" + +#. way : I : highway == secondary && ref != * +#. way : I : highway == tertiary && ref != * +#. way : I : highway == motorway && nat_ref != * +#: build/trans_validator.java:48 build/trans_validator.java:49 +#: build/trans_validator.java:50 +msgid "highway without a reference" +msgstr "沒有編號參照的公路" + +#. * : W : highway == road +#: build/trans_validator.java:51 +msgid "temporary highway type" +msgstr "暫時性道路類型" + +#. * : W : / *name +#: build/trans_validator.java:52 +msgid "misspelled key name" +msgstr "拼錯的鍵名" + +#. The following could replace unnamed way check. Still at the moment we keep it as it is +#. way : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction +#. way : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed +#. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE +#: build/trans_validator.java:58 +msgid "cycleway with tag bicycle" +msgstr "" + +#. way : W : highway == footway && foot == BOOLEAN_FALSE +#: build/trans_validator.java:59 +msgid "footway with tag foot" +msgstr "" + +#. way : I : highway == cycleway && bicycle == * # cycleway with tag bicycle +#. way : I : highway == footway && foot == * # footway with tag foot +#. way : W : highway == cycleway && cycleway == lane +#: build/trans_validator.java:62 +msgid "separate cycleway as lane on a cycleway" +msgstr "" + +#. way : W : highway == * && barrier == * +#: build/trans_validator.java:63 +msgid "barrier used on a way" +msgstr "用於路徑上的障礙物" + +#. way : I : waterway == * && layer != * # waterway without layer tag +#. way : I : highway == footway && maxspeed == * +#. way : I : highway == steps && maxspeed == * +#: build/trans_validator.java:66 build/trans_validator.java:67 +msgid "maxspeed used for footway" +msgstr "" + +#. * : W : layer == /\+. +#: build/trans_validator.java:69 +msgid "layer tag with + sign" +msgstr "有 + 號的圖層標籤" + +#. * : I : name == /.*Strasse. +#: build/trans_validator.java:71 +msgid "street name contains ss" +msgstr "街道名稱包含 ss" + +#. relation : E : type != * +#: build/trans_validator.java:73 +msgid "relation without type" +msgstr "沒有類型的關係" + +#. node : I : amenity == /restaurant|cafe|fast_food/ && name != * +#: build/trans_validator.java:75 +msgid "restaurant without name" +msgstr "沒有名稱的餐廳" + +#. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type +#. * : W : natural == water && waterway == * # unusual tag combination +#. * : W : highway == * && waterway == * +#. * : W : highway == * && natural == * +#: build/trans_validator.java:78 build/trans_validator.java:79 +msgid "unusual tag combination" +msgstr "不常見的標籤組合" + +#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg& +#: build/trans_wms.java:1 +msgid "Landsat" +msgstr "" + +#. http://irs.gis-lab.info/?layers=landsat& +#: build/trans_wms.java:2 +msgid "Landsat (mirror)" +msgstr "" + +#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& +#: build/trans_wms.java:3 +msgid "Open Aerial Map" +msgstr "開放航空圖" + +#. bing:bing +#: build/trans_wms.java:4 +msgid "Bing Sat" +msgstr "" + +#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? +#: build/trans_wms.java:5 +msgid "Yahoo Sat" +msgstr "Yahoo Sat" + +#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png +#: build/trans_wms.java:6 +msgid "MapQuest Open Aerial" +msgstr "" + +#. tms:http://tile.openstreetmap.org/ +#: build/trans_wms.java:7 +msgid "OpenStreetMap" +msgstr "OpenStreetMap" + +#. tms:http://tile.opencyclemap.org/cycle +#: build/trans_wms.java:8 +msgid "OpenCycleMap" +msgstr "OpenCycleMap" + +#. tms:http://tah.openstreetmap.org/Tiles/tile +#: build/trans_wms.java:9 +msgid "TilesAtHome" +msgstr "TilesAtHome" + +#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen +#: build/trans_wms.java:10 +msgid "PNV" +msgstr "" + +#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#: build/trans_wms.java:11 +msgid "Streets NRW Geofabrik.de" +msgstr "" + +#. tms:http://toolserver.org/tiles/hikebike/ +#: build/trans_wms.java:12 +msgid "Hike & Bike" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-hsb +#: build/trans_wms.java:13 +msgid "Sorbische Karte" +msgstr "" + +#. tms:http://toolserver.org/tiles/osm-locale-de +#: build/trans_wms.java:14 +msgid "Deutsche Karte" +msgstr "" + +#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m& +#: build/trans_wms.java:15 +msgid "Geoimage.at" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg& +#: build/trans_wms.java:16 +msgid "MSR Maps Topo" +msgstr "" + +#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#: build/trans_wms.java:17 +msgid "MSR Maps Urban" +msgstr "" + +#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE& +#: build/trans_wms.java:18 +msgid "Czech CUZK:KM" +msgstr "捷克 CUZK:KM" + +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#: build/trans_wms.java:19 +msgid "Czech UHUL:ORTOFOTO" +msgstr "捷克 UHUL:ORTOFOTO" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:20 +msgid "NPE Maps" +msgstr "NPE Maps" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:21 +msgid "NPE Maps (Tim)" +msgstr "NPE Maps (Tim)" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#: build/trans_wms.java:22 +msgid "7th Series (OS7)" +msgstr "7th Series (OS7)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:23 +msgid "MLIT Japan (ORTHO)" +msgstr "MLIT 日本 (ORTHO)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:24 +msgid "MLIT Japan (ORTHO01)" +msgstr "MLIT 日本 (ORTHO01)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:25 +msgid "MLIT Japan (ORTHO02)" +msgstr "MLIT 日本 (ORTHO02)" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:26 +msgid "MLIT Japan (ORTHO03)" +msgstr "MLIT 日本 (ORTHO03)" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:27 +msgid "Lodi - Italy" +msgstr "" + +#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg& +#: build/trans_wms.java:28 +msgid "Sicily - Italy" +msgstr "" + +#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg& +#: build/trans_wms.java:29 +msgid "PCN 2006 - Italy" +msgstr "PCN 2006 - 義大利" + +#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html +#: build/trans_wms.java:30 +msgid "SPOTMaps (France)" +msgstr "SPOTMaps（法國）" + +#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS +#: build/trans_wms.java:31 +msgid "PNOA Spain" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2& +#: build/trans_wms.java:32 +msgid "Estonia Basemap (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg& +#: build/trans_wms.java:33 +msgid "Estonia Ortho (Maaamet)" +msgstr "" + +#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793& +#: build/trans_wms.java:34 +msgid "Estonia Multi (Maaamet)" +msgstr "" + +#. tms:http://fugro.openstreetmap.dk/fugro2005 +#: build/trans_wms.java:35 +msgid "Fugro (Denmark)" +msgstr "" + +#~ msgid "to {0} primitive" +#~ msgid_plural "to {0} primtives" +#~ msgstr[0] "到 {0} 個原型" + +#~ msgid "Undelete {0} primitive" +#~ msgid_plural "Undelete {0} primitives" +#~ msgstr[0] "取消刪除 {0} 個原型" + +#~ msgid "" +#~ "Layer ''{0}'' already has a conflict for primitive
    ''{1}''." +#~ "
    Please resolve this conflict first, then try again." +#~ msgstr "" +#~ "圖層「{0}」已經有衝突於原型
    「{1}」。
    請先調解這個衝突，然後再" +#~ "試一次。" + +#~ msgid "" +#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping " +#~ "this primitive and retrying to upload." +#~ msgstr "警告：原型「{0}」已在伺服器上刪除了。正略過這個原型並嘗試重新上傳。" #~ msgid "The projection could not be read from preferences. Using EPSG:4326" @@ -40761,7 +41182,4 @@ #~ "以解決衝突。" -#~ msgid "Object" -#~ msgstr "物件" - #~ msgid "" #~ "Revert the state of all currently selected objects to the version " @@ -40859,4 +41277,7 @@ #~ msgid "Create non-audio markers when reading GPX." #~ msgstr "讀取 GPX 時建立非音效標記。" + +#~ msgid "Only interesting direction hints (e.g. with oneway tag)." +#~ msgstr "只有重要的方向提示（例如單行道標籤）。" #~ msgid "" @@ -41021,7 +41442,4 @@ #~ msgid "Add Selected" #~ msgstr "加入選取的" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "關係編輯器：{0}" #~ msgid "Cannot connect to server." @@ -42244,7 +42662,4 @@ #~ msgstr "下載清單" -#~ msgid "Open Aerial Map" -#~ msgstr "開放航空圖" - #~ msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." #~ msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。" @@ -42606,19 +43021,4 @@ #~ msgstr "住宿" -#~ msgid "abbreviated street name" -#~ msgstr "縮寫的街道名稱" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - -#~ msgid "OpenStreetMap" -#~ msgstr "OpenStreetMap" - -#~ msgid "OpenCycleMap" -#~ msgstr "OpenCycleMap" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - #~ msgid "Please enter a latitude in the range -90..90" #~ msgstr "請輸入緯度範圍 -90..90" @@ -42777,4 +43177,14 @@ #~ "{0}, {1}, {2}, {3}" +#~ msgid "Click do download the currently selected area" +#~ msgstr "點選以下載目前選取的區域" + +#~ msgid "" +#~ "Neither {0} nor {1} is enabled." +#~ "
    Please chose to either download OSM data, or GPX data, or both." +#~ msgstr "" +#~ "不論 {0} 或 {1} 都沒有啟用。
    請" +#~ "選擇下載 OSM 資料，或 GPX 資料，或兩個都選。" + #~ msgid "" #~ "Failed to open help page for url {0}.
    This is most likely due to " @@ -42806,4 +43216,9 @@ #~ msgid "The \"to\" way does not start or end at the \"via\" way." #~ msgstr "「到」路徑沒有開始或結束於「經過」路徑。" + +#~ msgid "" +#~ "The child relation
    {0}
    is deleted on the server. It cannot be " +#~ "loaded" +#~ msgstr "子關係
    {0}
    已在伺服器中刪除。它已無法載入" #~ msgid "Cannot open directory.
    Please select a file!" @@ -42849,4 +43264,19 @@ #~ "有 {0} 個額外節點用於
    在伺服器上刪除的路徑 {1} 。

    您是否也想要取" #~ "消刪除這個節點？" + +#~ msgid "" +#~ "

    Help content for help topic missing

    Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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

    " +#~ msgstr "" +#~ "

    缺少求助主題的內容

    求助主題的內容{0}尚不能取得。不管是您當" +#~ "地語言 ({1}) 或是英語版本都沒有。

    請協助改進 JOSM 求助系統並填好缺" +#~ "少的資訊。您可以編輯將求助主題編輯為當地的語言 ({1}) " +#~ "和 英語版本。

    " #~ msgid "create new objects" @@ -43148,28 +43578,4 @@ #~ msgstr "減速" -#~ msgid "barrier used on a way" -#~ msgstr "用於路徑上的障礙物" - -#~ msgid "NPE Maps" -#~ msgstr "NPE Maps" - -#~ msgid "NPE Maps (Tim)" -#~ msgstr "NPE Maps (Tim)" - -#~ msgid "7th Series (OS7)" -#~ msgstr "7th Series (OS7)" - -#~ msgid "MLIT Japan (ORTHO)" -#~ msgstr "MLIT 日本 (ORTHO)" - -#~ msgid "MLIT Japan (ORTHO01)" -#~ msgstr "MLIT 日本 (ORTHO01)" - -#~ msgid "MLIT Japan (ORTHO02)" -#~ msgstr "MLIT 日本 (ORTHO02)" - -#~ msgid "MLIT Japan (ORTHO03)" -#~ msgstr "MLIT 日本 (ORTHO03)" - #~ msgid "Internal style" #~ msgstr "內部樣式" @@ -43177,4 +43583,7 @@ #~ msgid "Allow remote control (reqires remotecontrol plugin)" #~ msgstr "允許遠端控制（需要 remotecontrol 外掛程式）" + +#~ msgid "Launch browser with wiki help to selected object" +#~ msgstr "執行瀏覽器取得選取物件的 wiki 說明" #~ msgid "Zoom level was not enough to record an offset precisely" @@ -43233,37 +43642,4 @@ #~ msgstr "已使用" -#~ msgid "Unnamed unclassified highway" -#~ msgstr "未命名未分類道路" - -#~ msgid "temporary highway type" -#~ msgstr "暫時性道路類型" - -#~ msgid "layer tag with + sign" -#~ msgstr "有 + 號的圖層標籤" - -#~ msgid "street name contains ss" -#~ msgstr "街道名稱包含 ss" - -#~ msgid "relation without type" -#~ msgstr "沒有類型的關係" - -#~ msgid "restaurant without name" -#~ msgstr "沒有名稱的餐廳" - -#~ msgid "unusual tag combination" -#~ msgstr "不常見的標籤組合" - -#~ msgid "Czech CUZK:KM" -#~ msgstr "捷克 CUZK:KM" - -#~ msgid "Czech UHUL:ORTOFOTO" -#~ msgstr "捷克 UHUL:ORTOFOTO" - -#~ msgid "PCN 2006 - Italy" -#~ msgstr "PCN 2006 - 義大利" - -#~ msgid "SPOTMaps (France)" -#~ msgstr "SPOTMaps（法國）" - #~ msgid "Available styles (from {0}):" #~ msgstr "可用的樣式（來自 {0}）："

    Help content for the help topic {0} is not available yet. It is missing both in your local language " +#~ "({1}) and in english.

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