Index: applications/editors/josm/i18n/po/zh_CN.po =================================================================== --- applications/editors/josm/i18n/po/zh_CN.po (revision 26726) +++ applications/editors/josm/i18n/po/zh_CN.po (revision 26727) @@ -5,27 +5,9 @@ # mmyfl , 2011. # -#. tms -#. true -#. -#. 18 -#. © OpenStreetMap contributors, CC-BY-SA -#. http://openstreetmap.org/ -#. -#. -#. -#. OpenStreetMap (Mapnik Black & White) -#. wms -#. -#. DE -#. -#. -#. -#. Hike & Bike -#: build/trans_wms.java:52 build/trans_wms.java:130 msgid "" msgstr "" "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-02 21:25+0200\n" +"POT-Creation-Date: 2011-09-27 19:09+0200\n" "PO-Revision-Date: 2011-08-29 11:39+0000\n" "Last-Translator: mmyfl \n" @@ -36,6 +18,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-09-02 19:15+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-09-27 14:54+0000\n" +"X-Generator: Launchpad (build 14041)\n" #. FIXME why is help not a JosmAction? @@ -45,6 +27,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:623 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:361 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:194 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:368 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 @@ -69,8 +51,8 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:131 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:145 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:171 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:175 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:50 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:111 @@ -82,7 +64,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:447 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:453 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:197 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:98 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:115 @@ -96,8 +78,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java:142 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:412 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658 -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:334 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:327 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:408 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:445 @@ -109,5 +92,4 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:510 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:182 -#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:199 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:213 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:388 @@ -117,6 +99,6 @@ #: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:664 -#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:495 -#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:501 +#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:480 +#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:486 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:145 @@ -130,10 +112,11 @@ #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:181 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:69 -#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:49 -#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:49 +#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:45 +#: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:47 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:45 -#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:190 -#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:216 -#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:260 +#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:196 +#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:222 +#: ../plugins/utilsplugin2/src/utilsplugin2/selection/NodeWayUtils.java:266 +#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:64 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68 msgid "Warning" @@ -169,14 +152,14 @@ #: ../core/src/org/openstreetmap/josm/Main.java:771 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95 -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:510 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:523 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:127 -#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:267 +#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:273 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:170 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46 @@ -187,7 +170,7 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1384 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:298 -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:898 -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:572 -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:768 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:877 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:722 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194 @@ -203,6 +186,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:117 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1199 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1209 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1220 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1230 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80 @@ -212,5 +195,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:376 -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:468 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:508 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:35 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:685 @@ -394,8 +377,8 @@ #: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:196 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:226 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:227 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136 @@ -409,6 +392,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:170 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 @@ -420,6 +403,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:292 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:443 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262 #: ../core/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java:67 @@ -434,6 +417,6 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1364 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:118 @@ -455,7 +438,9 @@ #: ../plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java:150 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25 -#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:97 #: ../plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java:389 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445 +#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:462 +#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:462 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:462 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 @@ -472,5 +457,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:741 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106 -#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152 +#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:70 msgid "Cancel" msgstr "取消" @@ -481,4 +466,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java:141 msgid "Please select at least one already uploaded node, way, or relation." msgstr "请至少选择一个已上传的节点、路径或关系。" @@ -537,4 +523,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25 +#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22 @@ -583,5 +570,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:84 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:82 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54 @@ -599,4 +586,5 @@ #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:18 +#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:145 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40 @@ -617,5 +605,5 @@ #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31 #: ../plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java:35 -#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:46 +#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:39 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44 #: ../plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java:37 @@ -633,4 +621,5 @@ #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:26 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java:28 +#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java:30 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:29 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:29 @@ -662,8 +651,8 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:625 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:665 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1000 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1030 @@ -692,5 +681,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:75 msgid "data" msgstr "数据" @@ -759,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:378 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:374 msgid "Close open changesets" msgstr "关闭开放的修改集合" @@ -777,6 +766,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88 -#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 +#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:47 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:19 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:68 @@ -854,9 +843,10 @@ msgstr "请选择要复制的对象。" -#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:15 +#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:19 msgid "Copy Coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:16 +#: ../core/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java:18 msgid "Copy coordinates of selected nodes to clipboard." msgstr "" @@ -911,13 +901,13 @@ #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:381 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:643 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:144 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:354 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1045 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:742 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:886 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96 @@ -929,5 +919,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:132 #: ../plugins/smed/src/smed/menu/file/TabManager.java:257 -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:100 +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:98 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:260 @@ -947,14 +937,14 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:225 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:226 -#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:102 -#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:227 +#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:96 +#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:97 msgid "Overwrite" msgstr "覆盖" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:228 -#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229 +#: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:99 msgid "File exists. Overwrite?" msgstr "文件已存在。覆盖吗？" @@ -1140,5 +1130,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:564 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:569 #, java-format msgid "Layer: {0}" @@ -1212,12 +1202,26 @@ msgstr "输出 GPX 文件" -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:20 -msgid "Object history" -msgstr "对象历史记录" - -#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18 +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:23 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:65 +#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20 +msgid "History" +msgstr "历史记录" + +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:21 msgid "Display history information about OSM ways, nodes, or relations." msgstr "显示 OSM 路径、节点或关系的历史记录信息。" + +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:20 +msgid "History (web)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java:18 +msgid "" +"Display history information about OSM ways, nodes, or relations in web " +"browser." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:46 @@ -1262,5 +1266,5 @@ #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687 -#: ../plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java:152 +#: ../plugins/utilsplugin2/src/utilsplugin2/ChooseURLAction.java:70 msgid "OK" msgstr "确定" @@ -1290,12 +1294,24 @@ msgstr "偏移书签已存在。覆盖？" -#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:20 -msgid "Info about Element" -msgstr "元素的信息" - -#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18 -msgid "Display object information about OSM nodes, ways, or relations." -msgstr "显示 OSM 路径、节点或关系的对象信息。" +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:23 +msgid "Advanced info" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:21 +msgid "" +"Display advanced object information about OSM nodes, ways, or relations." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:17 +#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:20 +msgid "Advanced info (web)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/InfoWebAction.java:18 +msgid "" +"Display object information about OSM nodes, ways, or relations in web " +"browser." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308 @@ -1315,6 +1331,9 @@ msgstr "选定的路径中有一条尚未封闭，因此不能连结。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:336 +msgid "Join area confirmation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:337 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:81 msgid "The selected way has nodes outside of the downloaded data region." @@ -1323,21 +1342,24 @@ msgstr[0] "选定的路径有节点位于已下载的数据区域之外。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:340 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82 msgid "This can lead to nodes being deleted accidentally." msgstr "这样可能会造成节点被意外的删除。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:344 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:341 msgid "Are you really sure to continue?" msgstr "您确定要继续吗？" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:695 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:342 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:839 msgid "Please abort if you are not sure" msgstr "如果不确定，请放弃" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:362 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:384 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:343 +msgid "The selected area is incomplete. Continue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:355 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:377 msgid "No intersection found. Nothing was changed." msgstr "找不到交叉点。没有东西修改。" @@ -1345,33 +1367,33 @@ #. revert changes #. FIXME: this is dirty hack -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:383 msgid "Reverting changes" msgstr "还原更改" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:435 msgid "Removed duplicate nodes" msgstr "删除重复节点" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:451 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:444 msgid "Added node on all intersections" msgstr "在所有的交叉点添加节点" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:505 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:498 msgid "Assemble new polygons" msgstr "组装新的多边形" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:511 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:504 msgid "Delete relations" msgstr "删除关系" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:516 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:509 msgid "Delete Ways that are not part of an inner multipolygon" msgstr "删除不属于内部多重多边形的一部分的路径" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:519 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:512 msgid "Joined overlapping areas" msgstr "已连结重叠的区域" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:522 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:515 msgid "" "Some of the ways were part of relations that have been modified. Please " @@ -1379,23 +1401,23 @@ msgstr "部分属于关系的一部分的路径被修改了。请检查是否造成错误。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:581 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:574 msgid "Fix tag conflicts" msgstr "修正标签冲突" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:855 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:848 msgid "Split ways into fragments" msgstr "将路径分割为片段" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1241 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1234 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways." msgstr "对不起。不能处理多个外部路径的多重多边形关系。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1251 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1244 msgid "" "Sorry. Cannot handle way that is outer in multiple multipolygon relations." msgstr "对不起。不能处理同时作为多个多重多边形的外部路径的路径。" +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1249 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1256 -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1263 msgid "" "Sorry. Cannot handle way that is both inner and outer in multipolygon " @@ -1403,19 +1425,19 @@ msgstr "对不起。不能处理同时作为多个多重多边形的外部和内部路径的路径。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1268 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1261 msgid "" "Sorry. Cannot handle way that is inner in multiple multipolygon relations." msgstr "对不起。不能处理同时作为多个多重多边形的内部路径的路径。" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1370 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1363 msgid "Removed Element from Relations" msgstr "从关系中移除元件" #. I18N: current action printed in status display -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1439 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1432 msgid "Remove tags from inner ways" msgstr "移除内部路径的标签" -#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1472 +#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1465 msgid "Join Areas Function" msgstr "连结区域功能" @@ -1620,4 +1642,5 @@ #. item "Highways/Streets/Bridge" combo "Incline" display value #. item "Highways/Streets/Tunnel" combo "Incline" display value +#. item "Highways/Streets/Ford" combo "Incline" display value #. item "Ways/Track" combo "Incline" display value #. item "Ways/Path" combo "Incline" display value @@ -1637,8 +1660,9 @@ #: build/trans_presets.java:435 build/trans_presets.java:491 #: build/trans_presets.java:508 build/trans_presets.java:523 -#: build/trans_presets.java:551 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:643 -#: build/trans_presets.java:667 build/trans_presets.java:692 -#: build/trans_presets.java:712 build/trans_presets.java:1402 +#: build/trans_presets.java:533 build/trans_presets.java:561 +#: build/trans_presets.java:598 build/trans_presets.java:619 +#: build/trans_presets.java:653 build/trans_presets.java:677 +#: build/trans_presets.java:702 build/trans_presets.java:722 +#: build/trans_presets.java:1401 msgid "up" msgstr "向上" @@ -1658,4 +1682,5 @@ #. item "Highways/Streets/Bridge" combo "Incline" display value #. item "Highways/Streets/Tunnel" combo "Incline" display value +#. item "Highways/Streets/Ford" combo "Incline" display value #. item "Ways/Track" combo "Incline" display value #. item "Ways/Path" combo "Incline" display value @@ -1675,8 +1700,9 @@ #: build/trans_presets.java:435 build/trans_presets.java:491 #: build/trans_presets.java:508 build/trans_presets.java:523 -#: build/trans_presets.java:551 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:643 -#: build/trans_presets.java:667 build/trans_presets.java:692 -#: build/trans_presets.java:712 build/trans_presets.java:1402 +#: build/trans_presets.java:533 build/trans_presets.java:561 +#: build/trans_presets.java:598 build/trans_presets.java:619 +#: build/trans_presets.java:653 build/trans_presets.java:677 +#: build/trans_presets.java:702 build/trans_presets.java:722 +#: build/trans_presets.java:1401 msgid "down" msgstr "向下" @@ -1756,19 +1782,31 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:156 #, java-format -msgid "Cannot open {0} file because no suitable file importer is available." +msgid "" +"Cannot open {0} file because file does not exist or no suitable file " +"importer is available." msgid_plural "" -"Cannot open {0} files because no suitable file importer is available." -msgstr[0] "不能打开文件 {0}，因为没有合适的文件处理程序可用。" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:209 +"Cannot open {0} files because files do not exist or no suitable file " +"importer is available." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167 +msgid "no importer" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:167 +msgid "does not exist" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:213 #, java-format msgid "Cannot open directory ''{0}''.
Please select a file." msgstr "不能打开目录“{0}”。
请选择一个文件。" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:214 msgid "Open file" msgstr "打开文件" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:290 #, java-format msgid "Opening {0} file..." @@ -1776,5 +1814,5 @@ msgstr[0] "正在打开 {0} 个文件..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:299 #, java-format msgid "Opening file ''{0}'' ..." @@ -1904,7 +1942,7 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:299 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:300 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:230 -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:126 +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:124 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:398 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:264 @@ -2071,5 +2109,5 @@ #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:237 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1408 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1418 msgid "Save" msgstr "保存" @@ -2085,30 +2123,30 @@ msgstr "文件 {0} 已存在。覆盖？" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82 msgid "No Exporter found! Nothing saved." msgstr "找不到输出程序！没有保存任何东西。" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 msgid "Empty document" msgstr "空文档" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114 msgid "Save anyway" msgstr "依然保存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116 msgid "The document contains no data." msgstr "文档中没有数据。" #. I18N: Display title of the window showing conflicts -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127 msgid "Conflicts" msgstr "冲突" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128 msgid "Reject Conflicts and Save" msgstr "拒绝冲突项目并保存" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -2116,13 +2154,13 @@ msgstr "尚有未解决的冲突。如果您全部拒绝就不会保存冲突。是否继续？" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:141 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:142 msgid "Save OSM file" msgstr "保存 OSM 文件" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 msgid "Save GPX file" msgstr "保存 GPX 文件" -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:145 msgid "Save Layer" msgstr "保存图层" @@ -2173,5 +2211,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337 @@ -2181,55 +2219,22 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:74 -#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1384 +#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1394 msgid "Close" msgstr "关闭" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36 msgid "Simplify Way" msgstr "简化路径" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:36 msgid "Delete unnecessary nodes from a way." msgstr "删除路径不需要的节点。" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:66 -#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77 -msgid "Yes, delete nodes" -msgstr "是，删除节点" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 -#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:77 -msgid "Delete nodes outside of downloaded data regions" -msgstr "删除在已下载数据区域外的节点" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72 -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:263 -#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78 -msgid "No, abort" -msgstr "否，中止" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:120 -#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78 -#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96 -msgid "Cancel operation" -msgstr "取消操作" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87 -#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82 -msgid "Do you want to delete them anyway?" -msgstr "是否要强制删除它们？" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89 -#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:83 -msgid "Delete nodes outside of data regions?" -msgstr "是否删除在数据区域外的节点？" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:49 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:90 msgid "Please select at least one way to simplify." msgstr "请选择至少一条路径来简化。" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:600 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 @@ -2240,10 +2245,16 @@ msgstr "是" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:61 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:95 msgid "Simplify all selected ways" msgstr "简化所有选定的路径" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67 +#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78 +#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96 +msgid "Cancel operation" +msgstr "取消操作" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:74 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97 #, java-format @@ -2252,10 +2263,10 @@ msgstr "选择范围中包含 {0} 个路径。您确定要简化它们全部吗？" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:77 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:97 msgid "Simplify ways?" msgstr "是否要简化路径？" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:114 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:196 #, java-format @@ -2264,5 +2275,5 @@ msgstr[0] "简化 {0} 路径" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:260 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:189 #, java-format msgid "Simplify Way (remove {0} node)" @@ -2317,5 +2328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:446 -#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:494 +#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:479 msgid "" "A role based relation membership was copied to all new ways.
You " @@ -2326,5 +2337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:452 -#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:500 +#: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java:485 msgid "" "A relation membership was copied to all new ways.
You should verify " @@ -2362,47 +2373,47 @@ msgstr "重制由多条路径使用的节点。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:86 msgid "This node is not glued to anything else." msgstr "这个节点并未黏合到其他项目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111 msgid "None of these nodes are glued to anything else." msgstr "这些节点没有一个黏合到其他项目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113 msgid "None of this way''s nodes are glued to anything else." msgstr "这个路径的节点没有一个黏合到其他项目上。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 msgid "The current selection cannot be used for unglueing." msgstr "当前的选择范围不能用于取消黏合。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 msgid "Select either:" msgstr "选择其一：" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125 msgid "* One tagged node, or" msgstr "* 一个有标签的节点，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126 msgid "* One node that is used by more than one way, or" msgstr "* 一个用于多条路径的节点，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127 msgid "* One node that is used by more than one way and one of those ways, or" msgstr "* 一个用于多条路径或用于那些路径之一的节点，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128 msgid "" "* One way that has one or more nodes that are used by more than one way, or" msgstr "* 一个有一或更多节点用于多条路径的路径，或" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129 msgid "" "* One way and one or more of its nodes that are used by more than one way." msgstr "* 一个路径且其一或多个节点用于多条路径。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131 msgid "" "Note: If a way is selected, this way will get fresh copies of the unglued\n" @@ -2415,18 +2426,35 @@ "都会被选定。" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:173 msgid "Unglued Node" msgstr "分离节点" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:377 #, java-format msgid "Dupe into {0} nodes" msgstr "分离为 {0} 个节点" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:400 #, java-format msgid "Dupe {0} node into {1} nodes" msgid_plural "Dupe {0} nodes into {1} nodes" msgstr[0] "将 {0} 个节点分离为 {1} 个节点" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:427 +msgid "Unglue confirmation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:428 +msgid "" +"You are about to unglue nodes outside of the area you have downloaded." +"
This can cause problems because other objects (that you do not see) " +"might use them.
Do you really want to unglue?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:433 +msgid "" +"You are about to unglue incomplete objects.
This will cause problems " +"because you don''t see the real object.
Do you really want to unglue?" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 @@ -2522,14 +2550,14 @@ msgstr "选择范围是空的" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89 msgid "Upload data" msgstr "上传数据" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88 msgid "Upload all changes in the active data layer to the OSM server" msgstr "将使用中图层的所有修改上传至 OSM 服务器" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109 #, java-format msgid "" @@ -2540,5 +2568,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:114 @@ -2546,5 +2574,5 @@ msgstr "没有要上传的修改。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:196 msgid "Nothing to upload. Get some data first." msgstr "没有要上传的东西。请先取得一些数据。" @@ -3018,8 +3046,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:150 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:151 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:307 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:171 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:109 @@ -3405,5 +3433,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:249 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:253 msgid "Search" msgstr "查找" @@ -3639,5 +3667,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:102 -#: build/trans_presets.java:1723 build/trans_presets.java:3632 +#: build/trans_presets.java:1722 build/trans_presets.java:3633 msgid "Other" msgstr "其他" @@ -3784,25 +3812,25 @@ msgstr "不能解决未决定的冲突" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:59 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:103 msgid "At least one object to delete required, got empty collection" msgstr "至少要删除一个对象，却收到空白集合" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150 #, java-format msgid "Delete node {0}" msgstr "删除节点 {0}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:151 #, java-format msgid "Delete way {0}" msgstr "删除路径 {0}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152 #, java-format msgid "Delete relation {0}" msgstr "删除关系 {0}" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165 #, java-format msgid "Delete {0} object" @@ -3810,5 +3838,5 @@ msgstr[0] "删除 {0} 个对象" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170 #, java-format msgid "Delete {0} node" @@ -3816,5 +3844,5 @@ msgstr[0] "删除 {0} 个节点" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:171 #, java-format msgid "Delete {0} way" @@ -3822,5 +3850,5 @@ msgstr[0] "删除 {0} 个路径" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172 #, java-format msgid "Delete {0} relation" @@ -3828,13 +3856,15 @@ msgstr[0] "删除 {0} 个关系" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:188 #, java-format msgid "Deleted ''{0}''" msgstr "已删除“{0}”" -#. leave message in one tr() as there is a grammatical -#. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:425 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:430 +#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488 +msgid "Delete confirmation" +msgstr "删除动作确认" + +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:431 msgid "" "You are about to delete nodes outside of the area you have downloaded." @@ -3845,14 +3875,5 @@ "到的)可能会使用它们。
确定要删除吗？" -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473 -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:434 -#: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:488 -msgid "Delete confirmation" -msgstr "删除动作确认" - -#. leave message in one tr() as there is a grammatical -#. connection. -#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488 +#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:436 msgid "" "You are about to delete incomplete objects.
This will cause problems " @@ -4063,4 +4084,5 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:79 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:81 +#: ../core/src/org/openstreetmap/josm/data/imagery/Shape.java:59 #, java-format msgid "Illegal latitude value ''{0}''" @@ -4068,19 +4090,20 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:77 +#: ../core/src/org/openstreetmap/josm/data/imagery/Shape.java:67 #, java-format msgid "Illegal longitude value ''{0}''" msgstr "不合法的经度数值“{0}”" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:336 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:337 #, java-format msgid "Warning: failed to persist preferences to ''{0}''" msgstr "警告：将首选项固定为“{0}”失败" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:459 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460 #, java-format msgid "Malformed config file at lines {0}" msgstr "设定文件第 {0} 行格式不良" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:471 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:472 #, java-format msgid "" @@ -4089,5 +4112,5 @@ msgstr "警告：初始化首选项失败。首选项目录“{0}”不是一个目录。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:475 #, java-format msgid "" @@ -4096,5 +4119,5 @@ msgstr "初始化首选项失败。
首选项目录“{0}”不是一个目录。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:482 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:483 #, java-format msgid "" @@ -4103,5 +4126,5 @@ msgstr "警告：初始化首选项失败。无法建立缺少的首选项目录：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:485 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486 #, java-format msgid "" @@ -4110,5 +4133,5 @@ msgstr "初始化首选项失败。
无法建立缺少的首选项目录：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:496 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:497 #, java-format msgid "" @@ -4116,5 +4139,5 @@ msgstr "警告：缺少首选项文件“{0}”。正在建立默认首选项文件。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501 #, java-format msgid "" @@ -4123,5 +4146,5 @@ msgstr "警告：以默认首选项文件取代现有的首选项文件“{0}”。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:508 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 #, java-format msgid "" @@ -4130,5 +4153,5 @@ msgstr "初始化首选项失败。
无法将首选项重设为默认值：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:521 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:522 #, java-format msgid "" @@ -4139,5 +4162,5 @@ "选项文件。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:531 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:532 #, java-format msgid "" @@ -4146,5 +4169,5 @@ msgstr "警告：无法初始化首选项。无法重置为默认首选项文件：{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:557 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:562 #, java-format msgid "Paint style {0}: {1}" @@ -4218,20 +4241,20 @@ msgstr "投影的坐标" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111 msgctxt "compass" msgid "S" msgstr "南" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112 msgctxt "compass" msgid "N" msgstr "北" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:127 msgctxt "compass" msgid "W" msgstr "西" -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:119 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:128 msgctxt "compass" msgid "E" @@ -4248,5 +4271,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:186 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:344 #, java-format msgid "ID > 0 expected. Got {0}." @@ -4254,5 +4277,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java:188 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:342 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:346 #, java-format msgid "Version > 0 expected. Got {0}." @@ -4270,5 +4293,5 @@ msgstr "ID = 0 的原型不能为不可视。" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:333 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:346 #, java-format msgid "" @@ -4276,5 +4299,5 @@ msgstr "无法将原型 {0} 添加到数据集合中，因为它已在其中" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:804 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:817 #, java-format msgid "" @@ -4346,5 +4369,5 @@ msgstr "有路径交叉。" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:946 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:950 msgid "" "Cannot merge because either of the participating primitives is new and the " @@ -4352,5 +4375,5 @@ msgstr "不能合并，因为参与的原型是新的但其他的却不是" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:948 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:952 #, java-format msgid "" @@ -4361,5 +4384,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:13 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167 msgid "node" msgid_plural "nodes" @@ -4380,6 +4403,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:404 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:590 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:445 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:630 msgid "relation" msgid_plural "relations" @@ -4721,5 +4744,5 @@ msgstr "横轴麦卡托" -#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:265 +#: ../core/src/org/openstreetmap/josm/data/validation/OsmValidator.java:271 #, java-format msgid "" @@ -4749,4 +4772,9 @@ msgid "Running test {0}" msgstr "执行测试 {0}" + +#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:26 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java:78 +msgid "Building inside building" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/validation/tests/ChangePropertyKeyCommand.java:74 @@ -4800,71 +4828,98 @@ msgstr "路径交叉" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:108 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:26 +msgid "Deprecated Tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:26 +msgid "Checks and corrects deprecated tags" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:165 +#, java-format +msgid "Deprecation fix of {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:170 +#, java-format +msgid "{0} is deprecated" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:172 +msgid " or " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java:172 +#, java-format +msgid "{0} is deprecated, use {1} instead" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:109 msgid "Duplicated nodes." msgstr "重复的节点。" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:109 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:110 msgid "This test checks that there are no nodes at the very same location." msgstr "这会测试有没有位置非常相近的节点存在。" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:196 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:197 msgid "Duplicate nodes in two un-closed ways" msgstr "两个未封闭路径有重复的节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:200 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:211 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:222 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:233 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:244 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:255 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:266 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:277 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:288 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:299 -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:310 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:201 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:212 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:223 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:234 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:245 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:256 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:267 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:278 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:289 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:300 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:311 msgid "Duplicated nodes" msgstr "重复的节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:207 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:208 msgid "Mixed type duplicated nodes" msgstr "混合类型的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:218 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:219 msgid "Highway duplicated nodes" msgstr "公路上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:229 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:230 msgid "Railway duplicated nodes" msgstr "铁路上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:240 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:241 msgid "Waterway duplicated nodes" msgstr "水路上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:251 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:252 msgid "Boundary duplicated nodes" msgstr "边境上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:262 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:263 msgid "Power duplicated nodes" msgstr "电线上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:273 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:274 msgid "Natural duplicated nodes" msgstr "自然上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:284 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:285 msgid "Building duplicated nodes" msgstr "建筑上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:295 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:296 msgid "Landuse duplicated nodes" msgstr "土地利用上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:306 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:307 msgid "Other duplicated nodes" msgstr "其他上的重复节点" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:334 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:335 msgid "Nodes at same position" msgstr "节点在同一个地点" @@ -4927,54 +4982,54 @@ #. item "Relations/Multipolygon" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:51 -#: build/trans_presets.java:4272 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52 +#: build/trans_presets.java:4273 msgid "Multipolygon" msgstr "多重多边形" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:52 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:53 msgid "This test checks if multipolygons are valid" msgstr "这个测试会检查多重多边形是否有效" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:121 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:122 msgid "Area style way is not closed" msgstr "区域类型的路径未封闭" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:146 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:147 msgid "No outer way for multipolygon" msgstr "多重多边形没有外部路径" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:182 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:183 msgid "No style for multipolygon" msgstr "多重多边形中没有样式" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:184 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:185 msgid "No style in multipolygon relation" msgstr "在多重多边形关系中没有样式" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:202 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:203 msgid "Style for inner way equals multipolygon" msgstr "内部路径的样式等同多重多边形" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:219 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:220 msgid "Style for outer way mismatches" msgstr "外部路径的样式不符" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:228 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:238 msgid "Multipolygon is not closed" msgstr "多重多边形未封闭" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:251 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:261 msgid "Multipolygon inner way is outside" msgstr "多重多边形的内部路径超出外围" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:254 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:264 msgid "Intersection between multipolygon ways" msgstr "多重多边形之间有交集" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:265 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:275 msgid "No useful role for multipolygon member" msgstr "多重多边形成员没有有用的角色" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:269 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:279 msgid "Non-Way in multipolygon" msgstr "多重多边形内没有路径" @@ -5010,4 +5065,9 @@ msgstr "这个测试会找出有相同名称的节点(可能是重复的节点)。" +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java:28 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingAreas.java:56 +msgid "Overlapping Areas" +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:45 msgid "Overlapping ways." @@ -5020,29 +5080,25 @@ msgstr "这个测试会检查两个节点间的连结是否被用于一条以上的路径。" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:103 -msgid "Overlapping areas" -msgstr "重叠的区域" - -#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:106 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:105 msgid "Overlapping highways (with area)" msgstr "重叠的公路(含区域)" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:109 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:108 msgid "Overlapping railways (with area)" msgstr "重叠的铁路(含区域)" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:112 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:111 msgid "Overlapping ways (with area)" msgstr "重叠的路径(含区域)" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:117 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:116 msgid "Overlapping highways" msgstr "重叠的公路" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:120 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:119 msgid "Overlapping railways" msgstr "重叠的铁路" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:123 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java:122 msgid "Overlapping ways" msgstr "重叠的路径" @@ -5245,7 +5301,7 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1078 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1088 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:876 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:466 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83 @@ -5266,7 +5322,7 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1090 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 @@ -5292,5 +5348,5 @@ #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:228 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:748 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:892 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138 msgid "Please select the row to delete." @@ -5452,48 +5508,48 @@ msgstr "最后的“经过”和“到达”路径未连接。" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:30 msgid "Unclosed Ways." msgstr "未封闭的路径。" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:32 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:30 msgid "This tests if ways which should be circular are closed." msgstr "这会测试圆形的路径是否已封闭。" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:72 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:70 #, java-format msgid "natural type {0}" msgstr "自然类型 {0}" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:76 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:74 #, java-format msgid "landuse type {0}" msgstr "土地利用的类型 {0}" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:80 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:78 #, java-format msgid "amenities type {0}" msgstr "便利设施类型 {0}" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:84 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:82 #, java-format msgid "sport type {0}" msgstr "运动设施类型 {0}" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:88 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:86 #, java-format msgid "tourism type {0}" msgstr "旅游设施类型 {0}" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:92 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:90 #, java-format msgid "shop type {0}" msgstr "商店类型 {0}" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:96 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:94 #, java-format msgid "leisure type {0}" msgstr "空闲类型 {0}" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:100 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:98 #, java-format msgid "waterway type {0}" @@ -5541,7 +5597,7 @@ #. #. color building -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:394 -#: build/trans_style.java:3600 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:102 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:435 +#: build/trans_style.java:3615 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "building" @@ -5553,10 +5609,10 @@ #. #. color area -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:108 -#: build/trans_style.java:3605 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:106 +#: build/trans_style.java:3620 msgid "area" msgstr "区域" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:128 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:115 msgid "Unclosed way" msgstr "未封闭的路径" @@ -5685,7 +5741,7 @@ #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:84 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:119 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:506 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:546 #, java-format msgid " [id: {0}]" @@ -5721,14 +5777,15 @@ msgstr "不要再显示(记住选择)" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:287 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:303 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148 msgid "incomplete" msgstr "不完整" #. I18n: name of house as parameter -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:150 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:234 #, java-format msgid "House {0}" @@ -5737,6 +5794,6 @@ #. I18n: house number, street as parameter, number should remain #. before street for better visibility -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:156 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:232 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:241 #, java-format msgid "House number {0} at {1}" @@ -5744,12 +5801,12 @@ #. I18n: house number as parameter -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:236 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:161 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:245 #, java-format msgid "House number {0}" msgstr "房屋门牌号码 {0}" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:215 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:224 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:600 msgid "highway" msgstr "公路" @@ -5757,17 +5814,17 @@ #. item "Relations/Route" combo "Route type" display value #. item "Relations/Directional Route (North America)" combo "Route type" display value -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:561 -#: build/trans_presets.java:4330 build/trans_presets.java:4360 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:601 +#: build/trans_presets.java:4332 build/trans_presets.java:4362 msgid "railway" msgstr "铁路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:562 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:602 msgid "waterway" msgstr "航道" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:218 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:227 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:603 msgid "landuse" msgstr "土地利用" @@ -5776,8 +5833,8 @@ #. nevertheless, who knows what future brings #. I18n: count of nodes as parameter -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:251 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:568 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:265 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:608 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:769 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:768 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422 @@ -5787,6 +5844,6 @@ msgstr[0] "{0} 节点" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:299 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:618 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:308 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:658 #, java-format msgid "{0} member" @@ -5794,9 +5851,9 @@ msgstr[0] "{0} 成员" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430 msgid "public transport" msgstr "公共交通" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:454 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:494 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -5902,5 +5959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:87 -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192 msgid "Imagery" msgstr "图像(I)" @@ -6135,5 +6192,5 @@ msgstr "首选项 {0} 已经被删除，因为它已不再使用了。" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41 msgid "File" @@ -6141,10 +6198,10 @@ #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188 #: build/specialmessages.java:89 msgid "View" msgstr "查看(V)" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:189 #: ../plugins/merge-overlap/src/mergeoverlap/MergeOverlapPlugin.java:26 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:26 @@ -6153,5 +6210,5 @@ msgstr "工具(T)" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:211 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191 @@ -6159,5 +6216,5 @@ msgstr "预设组合(P)" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:224 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:228 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50 @@ -6168,5 +6225,5 @@ msgstr "菜单：{0}" -#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:348 +#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:355 msgid "Audio" msgstr "音频(A)" @@ -6203,5 +6260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:93 -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:192 +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:190 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:203 msgid "Move up" @@ -6209,5 +6266,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapMover.java:98 -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:165 +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:163 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177 msgid "Move down" @@ -6363,5 +6420,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -6548,5 +6605,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:134 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:440 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192 @@ -6556,5 +6613,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" @@ -6564,5 +6621,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:144 msgid "Members" msgstr "成员" @@ -6784,5 +6841,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:181 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:466 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:618 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:783 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1035 @@ -6907,4 +6964,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:305 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:190 msgid "deleted" msgstr "已删除" @@ -6974,6 +7032,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:225 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:116 @@ -6995,6 +7053,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:260 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:606 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:78 @@ -7104,5 +7162,5 @@ #. item "Annotation/Address Interpolation" combo "Numbering scheme" display value #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:4256 +#: build/trans_presets.java:4257 #: ../plugins/smed/src/smed/menu/file/TabManager.java:291 msgid "all" @@ -7184,5 +7242,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:457 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:765 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:764 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427 @@ -7193,5 +7251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:458 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:773 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:772 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432 #, java-format @@ -7331,9 +7389,9 @@ msgstr "只显示有多个数值的标签" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:164 msgid "For selected objects only" msgstr "只用于选定的对象" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:165 msgid "" "Select to show changesets for the currently selected objects only." @@ -7344,18 +7402,18 @@ "据图层中所有对象的修改集合。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:247 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:243 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131 msgid "Changesets" msgstr "修改集合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:245 msgid "Open the list of changesets in the current layer." msgstr "开启在目前图层中修改集合的列表。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:290 msgid "Select all objects assigned to the currently selected changesets" msgstr "选择所有在目前选定修改集合中指派的对象" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:339 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374 @@ -7363,23 +7421,23 @@ msgstr "下载" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:344 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:340 msgid "Download information about the selected changesets from the OSM server" msgstr "从 OSM 服务器下载关于已选定修改集合的信息" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:379 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:375 msgid "Closes the selected open changesets" msgstr "关闭选定的开放修改集合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:406 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203 msgid "Show info" msgstr "显示信息" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:411 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:407 msgid "Open a web page for each selected changeset" msgstr "开启每个已选定修改集合的网页" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:450 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:446 #: build/specialmessages.java:49 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java:194 @@ -7387,5 +7445,5 @@ msgstr "详细数据" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:451 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:447 msgid "Opens the Changeset Manager window for the selected changesets" msgstr "开启已选定修改集合的修改集合管理程序" @@ -7404,12 +7462,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:111 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:65 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:608 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48 @@ -7456,5 +7514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:110 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100 @@ -7633,19 +7691,13 @@ msgstr "

关闭过滤器对话框，以查看所有的对象。

" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68 -#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20 -msgid "History" -msgstr "历史记录" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:64 msgid "Display the history of all selected items." msgstr "显示所有选定项目的历史记录。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:242 msgid "Object with history" msgstr "有历史记录的对象" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:260 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:155 @@ -7655,10 +7707,10 @@ msgstr "重新加载" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:261 msgid "Reload all currently selected objects and refresh the list." msgstr "重新加载所有目前的对象，并重新整理列表。" #. JButton -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:303 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:334 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:774 @@ -7670,146 +7722,140 @@ msgstr "显示" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:304 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:301 msgid "Display the history of the selected objects." msgstr "显示选定对象的历史记录。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:66 msgid "Advanced object info" msgstr "高级的对象信息" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:81 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:77 msgid "map style" msgstr "地图样式" #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:133 -msgid "In conflict with:\n" -msgstr "有冲突：\n" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:146 -#, java-format -msgid "Node id={0}" -msgstr "节点 id={0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148 +#, java-format +msgid " ({0})" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:144 +msgid "not in data set" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:169 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:191 -msgid " not in data set" -msgstr " 不在数据集合中" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:152 +msgid "Node: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:171 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51 +#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179 +msgid "Way: " +msgstr "路径： " + #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:173 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:195 -msgid " incomplete\n" -msgstr " 不完整\n" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:157 -#, java-format -msgid " lat={0} lon={1} (projected: x={2}, y={3}); " -msgstr " 纬度={0} 经度={1} (投影处：x={2}，y={3})； " - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:167 -#, java-format -msgid "Way id={0}" -msgstr "路径 id={0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:177 -#, java-format -msgid " {0} node; " -msgid_plural " {0} nodes; " -msgstr[0] " {0} 个节点； " - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:182 -msgid " nodes:\n" -msgstr " 节点：\n" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:189 -#, java-format -msgid "Relation id={0}" -msgstr "关系 id={0}" +msgid "Relation: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:193 +msgid "deleted-on-server" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:196 +msgid "modified" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:199 -#, java-format -msgid " {0} member; " -msgid_plural " {0} members; " -msgstr[0] " {0} 个成员； " - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:204 -msgid " members:\n" -msgstr " 成员：\n" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:216 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:289 +msgid "filtered/hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:202 +msgid "filtered/disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:206 +msgid "has direction keys (reversed)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:208 +msgid "has direction keys" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:213 +msgid "State: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:218 +msgid "Data Set: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:219 +msgid "Edited at: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:313 msgid "" msgstr "<新对象>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:212 -#, java-format -msgid "" -"Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}; Version: {4}" -msgstr "数据集合：{0}；用户：[{1}]；修改集合 id：{2}；时间戳记：{3}；版本：{4}" - #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:221 -msgid "; deleted" -msgstr "；已删除" +msgid "Edited by: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:223 +msgid "Version: " +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:224 -msgid "; deleted-on-server" -msgstr "；已在服务器上删除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:227 -msgid "; modified" -msgstr "；已修改" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:230 -msgid "; filtered/hidden" -msgstr "；已过滤/隐藏" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:233 -msgid "; filtered/disabled" -msgstr "；已过滤/禁用" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:236 -msgid "; has direction keys" -msgstr "；有带方向性的键" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:238 -msgid " (reversed)" -msgstr " (已反转)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:246 -msgid " tags:\n" -msgstr " 标签：\n" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:258 -msgid " way referrer:\n" -msgstr " 被路径参照：\n" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:269 -msgid " relation referrer:\n" -msgstr " 被关系参照：\n" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:295 -#, java-format -msgid "id: {0}" -msgstr "id：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:297 -#, java-format -msgid " name: {0}" -msgstr " 名称：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:300 -#, java-format -msgid " {0} name: {1}" -msgid_plural " {0} names: {1}" -msgstr[0] " {0} 名称：{1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:321 +msgid "In changeset: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:229 +msgid "Tags: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:250 +#, java-format +msgid "{0} Member: " +msgid_plural "{0} Members: " +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:254 +#, java-format +msgid " as \"{0}\"" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:260 +#, java-format +msgid "{0} Nodes: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:270 +msgid "Bounding box: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:275 +msgid "Coordinates: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:278 +msgid "Coordinates (projected): " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:286 +msgid "Part of: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:298 +msgid "In conflict with: " +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:325 #, java-format msgid "Styles Cache for \"{0}\":" msgstr "“{0}”的样式缓存：" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:331 #, java-format msgid "" @@ -7822,5 +7868,5 @@ "> 正在应用 {0} 样式“{1}”\n" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:333 #, java-format msgid "" @@ -7831,5 +7877,5 @@ "范围：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:334 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:338 #, java-format msgid "" @@ -7842,5 +7888,5 @@ "> 正在跳过“{0}”(不活动)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:337 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:341 msgid "" "\n" @@ -7852,22 +7898,22 @@ "生成样式的列表：\n" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:354 msgid "The 2 selected objects have identical style caches." msgstr "选择的 2 个对象具有相同的样式缓存。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:357 msgid "The 2 selected objects have different style caches." msgstr "选择的 2 个对象具有不同的样式缓存。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:360 msgid "" "Warning: The 2 selected objects have equal, but not identical style caches." msgstr "警告：选定的 2 个对象相同，但却有不完全相同的样式缓存。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:363 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:367 msgid "xml" msgstr "xml" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:369 msgid "mapcss" msgstr "mapcss" @@ -7885,5 +7931,5 @@ #. item "Facilities/Hunting Stand" combo "Hide" display value #. item "Facilities/Hunting Stand" combo "Lock" display value -#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:366 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:371 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:548 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91 @@ -7895,10 +7941,10 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440 -#: build/trans_presets.java:581 build/trans_presets.java:640 -#: build/trans_presets.java:777 build/trans_presets.java:799 -#: build/trans_presets.java:1424 build/trans_presets.java:1597 -#: build/trans_presets.java:1598 build/trans_presets.java:1599 -#: build/trans_presets.java:2375 build/trans_presets.java:2722 -#: build/trans_presets.java:2723 build/trans_presets.java:2724 +#: build/trans_presets.java:591 build/trans_presets.java:650 +#: build/trans_presets.java:787 build/trans_presets.java:809 +#: build/trans_presets.java:1423 build/trans_presets.java:1596 +#: build/trans_presets.java:1597 build/trans_presets.java:1598 +#: build/trans_presets.java:2376 build/trans_presets.java:2723 +#: build/trans_presets.java:2724 build/trans_presets.java:2725 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117 @@ -7990,5 +8036,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:434 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1461 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1462 msgid "Show/Hide" msgstr "显示/隐藏" @@ -8007,5 +8053,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:604 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:644 msgid "Activate" msgstr "使用" @@ -8039,9 +8085,9 @@ msgstr "这个图层不是目前使用中的(点击可使用)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:952 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:953 msgid "Move the selected layer one row up." msgstr "将选定的图层上移一列。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:973 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:974 msgid "Move the selected layer one row down." msgstr "将选定的图层下移一列。" @@ -8114,5 +8160,5 @@ #. item "Power/Power Generator" combo "Source" #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:562 -#: build/trans_presets.java:3263 +#: build/trans_presets.java:3264 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110 msgid "Source" @@ -8155,24 +8201,24 @@ #. group "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:774 -#: build/trans_presets.java:4271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:775 +#: build/trans_presets.java:4272 msgid "Relations" msgstr "关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 msgid "Open a list of all relations." msgstr "开启所有关系的列表。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:273 msgid "Open an editor for the selected relation" msgstr "开启选定关系的编辑器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:314 msgid "Delete the selected relation" msgstr "删除选定的关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:351 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:352 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:349 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40 @@ -8181,5 +8227,5 @@ msgstr "建立新的关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19 @@ -8187,133 +8233,125 @@ msgstr "建立这个关系的复本，并且在另一个编辑器窗口开启它" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428 msgid "Add the selected relations to the current selection" msgstr "添加选定的关系到当前的选择范围中" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429 msgid "Set the current selection to the list of selected relations" msgstr "将当前的选择范围设定到选定关系的列表中" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431 msgid "Select relation (add)" msgstr "选择关系(添加)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1232 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16 msgid "Select relation" msgstr "选择关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467 msgid "Add the members of all selected relations to current selection" msgstr "添加所有选定关系的成员到当前的选择范围中" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:468 msgid "Select the members of all selected relations" msgstr "选择所有已选定关系的成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470 msgid "Select members (add)" msgstr "选择成员(添加)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:469 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1263 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16 msgid "Select members" msgstr "选择成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:504 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505 msgid "Download all members of the selected relations" msgstr "下载已选定关系的所有成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506 msgid "Download members" msgstr "下载成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:536 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:818 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:537 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:817 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1282 msgid "Download incomplete members of selected relations" msgstr "下载已选定关系的不完整成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:538 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:820 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1274 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:539 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1284 msgid "Download incomplete members" msgstr "下载不完整的成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:772 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:773 #, java-format msgid "Relations: {0}" msgstr "关系：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:371 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 +#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64 +#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:67 +msgid "Selection" +msgstr "选择(N)" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128 +msgid "Open a selection list window." +msgstr "开启选择范围列表窗口。" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129 msgid "Current Selection" msgstr "当前的选择范围" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127 -msgid "Open a selection list window." -msgstr "开启选择范围列表窗口。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:254 msgid "Search for objects" msgstr "查找对象" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:308 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:309 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:310 msgid "Zoom to selection" msgstr "缩放至选择范围" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 msgid "Zoom to selected element(s)" msgstr "缩放至选定元件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:374 msgid "Call editor for relation" msgstr "开启关系编辑器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:376 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375 msgid "Call relation editor for selected relation" msgstr "开启选定关系的编辑器" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:403 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:402 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1236 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:17 msgid "Select in relation list" msgstr "在关系列表中选择" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:404 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1227 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:403 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1237 #: ../plugins/reltoolbox/src/relcontext/actions/SelectInRelationPanelAction.java:18 msgid "Select relation in relation list." msgstr "在关系列表中选择。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:371 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 -#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64 -#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:62 -msgid "Selection" -msgstr "选择(N)" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:464 #, java-format msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" msgstr "选择：关系：{0} / 路径：{1} / 节点：{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:783 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:782 #, java-format msgid "Selection: {0}" msgstr "选择范围：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:855 -msgid "Get detailed information on the internal state of the objects." -msgstr "取得对象内部状态的详细信息。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:856 -msgid "Inspect" -msgstr "检查" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:416 @@ -8396,11 +8434,14 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89 +msgid "Validation Results" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89 +msgid "Open the validation window." +msgstr "开启验证窗口。" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:90 msgid "Validation results" msgstr "验证结果" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:89 -msgid "Open the validation window." -msgstr "开启验证窗口。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:95 @@ -8748,4 +8789,9 @@ #. #. item "Highways/Streets/Tunnel" text "Name" +#. +#. +#. +#. +#. item "Highways/Streets/Ford" text "Name" #. #. @@ -8801,8 +8847,4 @@ #. #. item "Waypoints/City Limit" text "Name" -#. -#. -#. -#. item "Waypoints/Ford" text "Name" #. #. @@ -9587,5 +9629,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910 #: build/specialmessages.java:70 build/trans_presets.java:116 #: build/trans_presets.java:154 build/trans_presets.java:196 @@ -9596,179 +9638,180 @@ #: build/trans_presets.java:423 build/trans_presets.java:482 #: build/trans_presets.java:503 build/trans_presets.java:519 -#: build/trans_presets.java:535 build/trans_presets.java:561 -#: build/trans_presets.java:598 build/trans_presets.java:632 -#: build/trans_presets.java:657 build/trans_presets.java:681 -#: build/trans_presets.java:702 build/trans_presets.java:723 -#: build/trans_presets.java:743 build/trans_presets.java:753 -#: build/trans_presets.java:764 build/trans_presets.java:826 -#: build/trans_presets.java:844 build/trans_presets.java:853 -#: build/trans_presets.java:926 build/trans_presets.java:1085 -#: build/trans_presets.java:1093 build/trans_presets.java:1101 -#: build/trans_presets.java:1109 build/trans_presets.java:1120 -#: build/trans_presets.java:1129 build/trans_presets.java:1135 -#: build/trans_presets.java:1143 build/trans_presets.java:1150 -#: build/trans_presets.java:1164 build/trans_presets.java:1171 -#: build/trans_presets.java:1176 build/trans_presets.java:1183 -#: build/trans_presets.java:1188 build/trans_presets.java:1194 -#: build/trans_presets.java:1201 build/trans_presets.java:1211 -#: build/trans_presets.java:1217 build/trans_presets.java:1223 -#: build/trans_presets.java:1228 build/trans_presets.java:1234 -#: build/trans_presets.java:1242 build/trans_presets.java:1251 -#: build/trans_presets.java:1258 build/trans_presets.java:1264 -#: build/trans_presets.java:1281 build/trans_presets.java:1288 -#: build/trans_presets.java:1295 build/trans_presets.java:1392 -#: build/trans_presets.java:1444 build/trans_presets.java:1458 -#: build/trans_presets.java:1469 build/trans_presets.java:1482 -#: build/trans_presets.java:1495 build/trans_presets.java:1509 -#: build/trans_presets.java:1520 build/trans_presets.java:1531 -#: build/trans_presets.java:1542 build/trans_presets.java:1553 -#: build/trans_presets.java:1563 build/trans_presets.java:1574 -#: build/trans_presets.java:1580 build/trans_presets.java:1590 -#: build/trans_presets.java:1611 build/trans_presets.java:1643 -#: build/trans_presets.java:1653 build/trans_presets.java:1659 -#: build/trans_presets.java:1667 build/trans_presets.java:1683 -#: build/trans_presets.java:1694 build/trans_presets.java:1703 -#: build/trans_presets.java:1712 build/trans_presets.java:1736 -#: build/trans_presets.java:1744 build/trans_presets.java:1758 -#: build/trans_presets.java:1769 build/trans_presets.java:1779 -#: build/trans_presets.java:1789 build/trans_presets.java:1809 -#: build/trans_presets.java:1821 build/trans_presets.java:1832 -#: build/trans_presets.java:1852 build/trans_presets.java:1867 -#: build/trans_presets.java:1875 build/trans_presets.java:1932 -#: build/trans_presets.java:1949 build/trans_presets.java:1967 -#: build/trans_presets.java:1984 build/trans_presets.java:2001 -#: build/trans_presets.java:2018 build/trans_presets.java:2035 -#: build/trans_presets.java:2053 build/trans_presets.java:2075 -#: build/trans_presets.java:2094 build/trans_presets.java:2115 -#: build/trans_presets.java:2134 build/trans_presets.java:2151 -#: build/trans_presets.java:2170 build/trans_presets.java:2188 -#: build/trans_presets.java:2205 build/trans_presets.java:2222 -#: build/trans_presets.java:2238 build/trans_presets.java:2245 -#: build/trans_presets.java:2253 build/trans_presets.java:2260 -#: build/trans_presets.java:2277 build/trans_presets.java:2285 -#: build/trans_presets.java:2300 build/trans_presets.java:2310 -#: build/trans_presets.java:2322 build/trans_presets.java:2332 -#: build/trans_presets.java:2339 build/trans_presets.java:2348 -#: build/trans_presets.java:2357 build/trans_presets.java:2363 -#: build/trans_presets.java:2372 build/trans_presets.java:2382 -#: build/trans_presets.java:2387 build/trans_presets.java:2395 -#: build/trans_presets.java:2402 build/trans_presets.java:2410 -#: build/trans_presets.java:2419 build/trans_presets.java:2426 -#: build/trans_presets.java:2433 build/trans_presets.java:2439 -#: build/trans_presets.java:2447 build/trans_presets.java:2458 -#: build/trans_presets.java:2470 build/trans_presets.java:2476 -#: build/trans_presets.java:2483 build/trans_presets.java:2491 -#: build/trans_presets.java:2498 build/trans_presets.java:2505 -#: build/trans_presets.java:2513 build/trans_presets.java:2520 -#: build/trans_presets.java:2526 build/trans_presets.java:2534 -#: build/trans_presets.java:2540 build/trans_presets.java:2546 -#: build/trans_presets.java:2552 build/trans_presets.java:2559 -#: build/trans_presets.java:2569 build/trans_presets.java:2575 -#: build/trans_presets.java:2581 build/trans_presets.java:2587 -#: build/trans_presets.java:2596 build/trans_presets.java:2604 -#: build/trans_presets.java:2636 build/trans_presets.java:2714 -#: build/trans_presets.java:2732 build/trans_presets.java:2742 -#: build/trans_presets.java:2757 build/trans_presets.java:2766 -#: build/trans_presets.java:2775 build/trans_presets.java:2784 -#: build/trans_presets.java:2793 build/trans_presets.java:2799 -#: build/trans_presets.java:2807 build/trans_presets.java:2813 -#: build/trans_presets.java:2819 build/trans_presets.java:2825 -#: build/trans_presets.java:2831 build/trans_presets.java:2837 -#: build/trans_presets.java:2843 build/trans_presets.java:2849 -#: build/trans_presets.java:2855 build/trans_presets.java:2861 -#: build/trans_presets.java:2867 build/trans_presets.java:2873 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 -#: build/trans_presets.java:2892 build/trans_presets.java:2901 -#: build/trans_presets.java:2909 build/trans_presets.java:2915 -#: build/trans_presets.java:2921 build/trans_presets.java:2927 -#: build/trans_presets.java:2933 build/trans_presets.java:2939 -#: build/trans_presets.java:2945 build/trans_presets.java:2951 -#: build/trans_presets.java:2957 build/trans_presets.java:2965 -#: build/trans_presets.java:2974 build/trans_presets.java:2981 -#: build/trans_presets.java:2987 build/trans_presets.java:2993 -#: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3011 build/trans_presets.java:3017 -#: build/trans_presets.java:3023 build/trans_presets.java:3029 -#: build/trans_presets.java:3035 build/trans_presets.java:3041 -#: build/trans_presets.java:3049 build/trans_presets.java:3055 -#: build/trans_presets.java:3061 build/trans_presets.java:3067 -#: build/trans_presets.java:3074 build/trans_presets.java:3080 -#: build/trans_presets.java:3093 build/trans_presets.java:3108 -#: build/trans_presets.java:3115 build/trans_presets.java:3123 -#: build/trans_presets.java:3128 build/trans_presets.java:3143 -#: build/trans_presets.java:3150 build/trans_presets.java:3162 -#: build/trans_presets.java:3172 build/trans_presets.java:3179 -#: build/trans_presets.java:3188 build/trans_presets.java:3195 -#: build/trans_presets.java:3202 build/trans_presets.java:3208 -#: build/trans_presets.java:3215 build/trans_presets.java:3221 -#: build/trans_presets.java:3235 build/trans_presets.java:3245 -#: build/trans_presets.java:3251 build/trans_presets.java:3262 -#: build/trans_presets.java:3282 build/trans_presets.java:3338 -#: build/trans_presets.java:3344 build/trans_presets.java:3352 -#: build/trans_presets.java:3359 build/trans_presets.java:3365 -#: build/trans_presets.java:3371 build/trans_presets.java:3377 -#: build/trans_presets.java:3382 build/trans_presets.java:3387 -#: build/trans_presets.java:3392 build/trans_presets.java:3401 -#: build/trans_presets.java:3408 build/trans_presets.java:3415 -#: build/trans_presets.java:3423 build/trans_presets.java:3430 -#: build/trans_presets.java:3438 build/trans_presets.java:3447 -#: build/trans_presets.java:3455 build/trans_presets.java:3464 -#: build/trans_presets.java:3473 build/trans_presets.java:3480 -#: build/trans_presets.java:3488 build/trans_presets.java:3494 -#: build/trans_presets.java:3502 build/trans_presets.java:3510 -#: build/trans_presets.java:3517 build/trans_presets.java:3524 -#: build/trans_presets.java:3530 build/trans_presets.java:3538 -#: build/trans_presets.java:3545 build/trans_presets.java:3551 -#: build/trans_presets.java:3559 build/trans_presets.java:3568 -#: build/trans_presets.java:3574 build/trans_presets.java:3582 -#: build/trans_presets.java:3591 build/trans_presets.java:3598 -#: build/trans_presets.java:3604 build/trans_presets.java:3613 -#: build/trans_presets.java:3622 build/trans_presets.java:3638 -#: build/trans_presets.java:3647 build/trans_presets.java:3655 -#: build/trans_presets.java:3661 build/trans_presets.java:3667 -#: build/trans_presets.java:3675 build/trans_presets.java:3684 -#: build/trans_presets.java:3693 build/trans_presets.java:3700 -#: build/trans_presets.java:3708 build/trans_presets.java:3715 -#: build/trans_presets.java:3723 build/trans_presets.java:3731 -#: build/trans_presets.java:3739 build/trans_presets.java:3748 -#: build/trans_presets.java:3757 build/trans_presets.java:3765 -#: build/trans_presets.java:3773 build/trans_presets.java:3780 -#: build/trans_presets.java:3787 build/trans_presets.java:3795 -#: build/trans_presets.java:3802 build/trans_presets.java:3810 -#: build/trans_presets.java:3837 build/trans_presets.java:3843 -#: build/trans_presets.java:3849 build/trans_presets.java:3855 -#: build/trans_presets.java:3861 build/trans_presets.java:3869 -#: build/trans_presets.java:3876 build/trans_presets.java:3883 -#: build/trans_presets.java:3890 build/trans_presets.java:3897 -#: build/trans_presets.java:3905 build/trans_presets.java:3913 -#: build/trans_presets.java:3921 build/trans_presets.java:3928 -#: build/trans_presets.java:3935 build/trans_presets.java:3942 -#: build/trans_presets.java:3951 build/trans_presets.java:3960 -#: build/trans_presets.java:3968 build/trans_presets.java:3976 -#: build/trans_presets.java:3984 build/trans_presets.java:3993 -#: build/trans_presets.java:4001 build/trans_presets.java:4011 -#: build/trans_presets.java:4021 build/trans_presets.java:4030 -#: build/trans_presets.java:4036 build/trans_presets.java:4042 -#: build/trans_presets.java:4048 build/trans_presets.java:4053 -#: build/trans_presets.java:4059 build/trans_presets.java:4069 -#: build/trans_presets.java:4075 build/trans_presets.java:4081 -#: build/trans_presets.java:4087 build/trans_presets.java:4094 -#: build/trans_presets.java:4101 build/trans_presets.java:4107 -#: build/trans_presets.java:4113 build/trans_presets.java:4120 -#: build/trans_presets.java:4126 build/trans_presets.java:4131 -#: build/trans_presets.java:4138 build/trans_presets.java:4145 -#: build/trans_presets.java:4151 build/trans_presets.java:4160 -#: build/trans_presets.java:4168 build/trans_presets.java:4174 -#: build/trans_presets.java:4180 build/trans_presets.java:4187 -#: build/trans_presets.java:4195 build/trans_presets.java:4201 -#: build/trans_presets.java:4208 build/trans_presets.java:4214 -#: build/trans_presets.java:4220 build/trans_presets.java:4226 -#: build/trans_presets.java:4232 build/trans_presets.java:4279 -#: build/trans_presets.java:4293 build/trans_presets.java:4312 -#: build/trans_presets.java:4331 build/trans_presets.java:4361 -#: build/trans_presets.java:4386 +#: build/trans_presets.java:532 build/trans_presets.java:545 +#: build/trans_presets.java:571 build/trans_presets.java:608 +#: build/trans_presets.java:642 build/trans_presets.java:667 +#: build/trans_presets.java:691 build/trans_presets.java:712 +#: build/trans_presets.java:733 build/trans_presets.java:753 +#: build/trans_presets.java:763 build/trans_presets.java:774 +#: build/trans_presets.java:836 build/trans_presets.java:855 +#: build/trans_presets.java:928 build/trans_presets.java:1084 +#: build/trans_presets.java:1092 build/trans_presets.java:1100 +#: build/trans_presets.java:1108 build/trans_presets.java:1119 +#: build/trans_presets.java:1128 build/trans_presets.java:1134 +#: build/trans_presets.java:1142 build/trans_presets.java:1149 +#: build/trans_presets.java:1163 build/trans_presets.java:1170 +#: build/trans_presets.java:1175 build/trans_presets.java:1182 +#: build/trans_presets.java:1187 build/trans_presets.java:1193 +#: build/trans_presets.java:1200 build/trans_presets.java:1210 +#: build/trans_presets.java:1216 build/trans_presets.java:1222 +#: build/trans_presets.java:1227 build/trans_presets.java:1233 +#: build/trans_presets.java:1241 build/trans_presets.java:1250 +#: build/trans_presets.java:1257 build/trans_presets.java:1263 +#: build/trans_presets.java:1280 build/trans_presets.java:1287 +#: build/trans_presets.java:1294 build/trans_presets.java:1391 +#: build/trans_presets.java:1443 build/trans_presets.java:1457 +#: build/trans_presets.java:1468 build/trans_presets.java:1481 +#: build/trans_presets.java:1494 build/trans_presets.java:1508 +#: build/trans_presets.java:1519 build/trans_presets.java:1530 +#: build/trans_presets.java:1541 build/trans_presets.java:1552 +#: build/trans_presets.java:1562 build/trans_presets.java:1573 +#: build/trans_presets.java:1579 build/trans_presets.java:1589 +#: build/trans_presets.java:1610 build/trans_presets.java:1642 +#: build/trans_presets.java:1652 build/trans_presets.java:1658 +#: build/trans_presets.java:1666 build/trans_presets.java:1682 +#: build/trans_presets.java:1693 build/trans_presets.java:1702 +#: build/trans_presets.java:1711 build/trans_presets.java:1735 +#: build/trans_presets.java:1745 build/trans_presets.java:1759 +#: build/trans_presets.java:1770 build/trans_presets.java:1780 +#: build/trans_presets.java:1790 build/trans_presets.java:1810 +#: build/trans_presets.java:1822 build/trans_presets.java:1833 +#: build/trans_presets.java:1853 build/trans_presets.java:1868 +#: build/trans_presets.java:1876 build/trans_presets.java:1933 +#: build/trans_presets.java:1950 build/trans_presets.java:1968 +#: build/trans_presets.java:1985 build/trans_presets.java:2002 +#: build/trans_presets.java:2019 build/trans_presets.java:2036 +#: build/trans_presets.java:2054 build/trans_presets.java:2076 +#: build/trans_presets.java:2095 build/trans_presets.java:2116 +#: build/trans_presets.java:2135 build/trans_presets.java:2152 +#: build/trans_presets.java:2171 build/trans_presets.java:2189 +#: build/trans_presets.java:2206 build/trans_presets.java:2223 +#: build/trans_presets.java:2239 build/trans_presets.java:2246 +#: build/trans_presets.java:2254 build/trans_presets.java:2261 +#: build/trans_presets.java:2278 build/trans_presets.java:2286 +#: build/trans_presets.java:2301 build/trans_presets.java:2311 +#: build/trans_presets.java:2323 build/trans_presets.java:2333 +#: build/trans_presets.java:2340 build/trans_presets.java:2349 +#: build/trans_presets.java:2358 build/trans_presets.java:2364 +#: build/trans_presets.java:2373 build/trans_presets.java:2383 +#: build/trans_presets.java:2388 build/trans_presets.java:2396 +#: build/trans_presets.java:2403 build/trans_presets.java:2411 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2434 build/trans_presets.java:2440 +#: build/trans_presets.java:2448 build/trans_presets.java:2459 +#: build/trans_presets.java:2471 build/trans_presets.java:2477 +#: build/trans_presets.java:2484 build/trans_presets.java:2492 +#: build/trans_presets.java:2499 build/trans_presets.java:2506 +#: build/trans_presets.java:2514 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2535 +#: build/trans_presets.java:2541 build/trans_presets.java:2547 +#: build/trans_presets.java:2553 build/trans_presets.java:2560 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2582 build/trans_presets.java:2588 +#: build/trans_presets.java:2597 build/trans_presets.java:2605 +#: build/trans_presets.java:2637 build/trans_presets.java:2715 +#: build/trans_presets.java:2733 build/trans_presets.java:2743 +#: build/trans_presets.java:2758 build/trans_presets.java:2767 +#: build/trans_presets.java:2776 build/trans_presets.java:2785 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2808 build/trans_presets.java:2814 +#: build/trans_presets.java:2820 build/trans_presets.java:2826 +#: build/trans_presets.java:2832 build/trans_presets.java:2838 +#: build/trans_presets.java:2844 build/trans_presets.java:2850 +#: build/trans_presets.java:2856 build/trans_presets.java:2862 +#: build/trans_presets.java:2868 build/trans_presets.java:2874 +#: build/trans_presets.java:2880 build/trans_presets.java:2886 +#: build/trans_presets.java:2893 build/trans_presets.java:2902 +#: build/trans_presets.java:2910 build/trans_presets.java:2916 +#: build/trans_presets.java:2922 build/trans_presets.java:2928 +#: build/trans_presets.java:2934 build/trans_presets.java:2940 +#: build/trans_presets.java:2946 build/trans_presets.java:2952 +#: build/trans_presets.java:2958 build/trans_presets.java:2966 +#: build/trans_presets.java:2975 build/trans_presets.java:2982 +#: build/trans_presets.java:2988 build/trans_presets.java:2994 +#: build/trans_presets.java:3000 build/trans_presets.java:3006 +#: build/trans_presets.java:3012 build/trans_presets.java:3018 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3036 build/trans_presets.java:3042 +#: build/trans_presets.java:3050 build/trans_presets.java:3056 +#: build/trans_presets.java:3062 build/trans_presets.java:3068 +#: build/trans_presets.java:3075 build/trans_presets.java:3081 +#: build/trans_presets.java:3094 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3124 +#: build/trans_presets.java:3129 build/trans_presets.java:3144 +#: build/trans_presets.java:3151 build/trans_presets.java:3163 +#: build/trans_presets.java:3173 build/trans_presets.java:3180 +#: build/trans_presets.java:3189 build/trans_presets.java:3196 +#: build/trans_presets.java:3203 build/trans_presets.java:3209 +#: build/trans_presets.java:3216 build/trans_presets.java:3222 +#: build/trans_presets.java:3236 build/trans_presets.java:3246 +#: build/trans_presets.java:3252 build/trans_presets.java:3263 +#: build/trans_presets.java:3283 build/trans_presets.java:3339 +#: build/trans_presets.java:3345 build/trans_presets.java:3353 +#: build/trans_presets.java:3360 build/trans_presets.java:3366 +#: build/trans_presets.java:3372 build/trans_presets.java:3378 +#: build/trans_presets.java:3383 build/trans_presets.java:3388 +#: build/trans_presets.java:3393 build/trans_presets.java:3402 +#: build/trans_presets.java:3409 build/trans_presets.java:3416 +#: build/trans_presets.java:3424 build/trans_presets.java:3431 +#: build/trans_presets.java:3439 build/trans_presets.java:3448 +#: build/trans_presets.java:3456 build/trans_presets.java:3465 +#: build/trans_presets.java:3474 build/trans_presets.java:3481 +#: build/trans_presets.java:3489 build/trans_presets.java:3495 +#: build/trans_presets.java:3503 build/trans_presets.java:3511 +#: build/trans_presets.java:3518 build/trans_presets.java:3525 +#: build/trans_presets.java:3531 build/trans_presets.java:3539 +#: build/trans_presets.java:3546 build/trans_presets.java:3552 +#: build/trans_presets.java:3560 build/trans_presets.java:3569 +#: build/trans_presets.java:3575 build/trans_presets.java:3583 +#: build/trans_presets.java:3592 build/trans_presets.java:3599 +#: build/trans_presets.java:3605 build/trans_presets.java:3614 +#: build/trans_presets.java:3623 build/trans_presets.java:3639 +#: build/trans_presets.java:3648 build/trans_presets.java:3656 +#: build/trans_presets.java:3662 build/trans_presets.java:3668 +#: build/trans_presets.java:3676 build/trans_presets.java:3685 +#: build/trans_presets.java:3694 build/trans_presets.java:3701 +#: build/trans_presets.java:3709 build/trans_presets.java:3716 +#: build/trans_presets.java:3724 build/trans_presets.java:3732 +#: build/trans_presets.java:3740 build/trans_presets.java:3749 +#: build/trans_presets.java:3758 build/trans_presets.java:3766 +#: build/trans_presets.java:3774 build/trans_presets.java:3781 +#: build/trans_presets.java:3788 build/trans_presets.java:3796 +#: build/trans_presets.java:3803 build/trans_presets.java:3811 +#: build/trans_presets.java:3838 build/trans_presets.java:3844 +#: build/trans_presets.java:3850 build/trans_presets.java:3856 +#: build/trans_presets.java:3862 build/trans_presets.java:3870 +#: build/trans_presets.java:3877 build/trans_presets.java:3884 +#: build/trans_presets.java:3891 build/trans_presets.java:3898 +#: build/trans_presets.java:3906 build/trans_presets.java:3914 +#: build/trans_presets.java:3922 build/trans_presets.java:3929 +#: build/trans_presets.java:3936 build/trans_presets.java:3943 +#: build/trans_presets.java:3952 build/trans_presets.java:3961 +#: build/trans_presets.java:3969 build/trans_presets.java:3977 +#: build/trans_presets.java:3985 build/trans_presets.java:3994 +#: build/trans_presets.java:4002 build/trans_presets.java:4012 +#: build/trans_presets.java:4022 build/trans_presets.java:4031 +#: build/trans_presets.java:4037 build/trans_presets.java:4043 +#: build/trans_presets.java:4049 build/trans_presets.java:4054 +#: build/trans_presets.java:4060 build/trans_presets.java:4070 +#: build/trans_presets.java:4076 build/trans_presets.java:4082 +#: build/trans_presets.java:4088 build/trans_presets.java:4095 +#: build/trans_presets.java:4102 build/trans_presets.java:4108 +#: build/trans_presets.java:4114 build/trans_presets.java:4121 +#: build/trans_presets.java:4127 build/trans_presets.java:4132 +#: build/trans_presets.java:4139 build/trans_presets.java:4146 +#: build/trans_presets.java:4152 build/trans_presets.java:4161 +#: build/trans_presets.java:4169 build/trans_presets.java:4175 +#: build/trans_presets.java:4181 build/trans_presets.java:4188 +#: build/trans_presets.java:4196 build/trans_presets.java:4202 +#: build/trans_presets.java:4209 build/trans_presets.java:4215 +#: build/trans_presets.java:4221 build/trans_presets.java:4227 +#: build/trans_presets.java:4233 build/trans_presets.java:4280 +#: build/trans_presets.java:4294 build/trans_presets.java:4314 +#: build/trans_presets.java:4333 build/trans_presets.java:4363 +#: build/trans_presets.java:4388 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:159 +#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:68 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22 @@ -10204,9 +10247,9 @@ msgstr "这个修改集合查询 URL 是无效的" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:174 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:180 msgid "Add Properties" msgstr "添加属性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212 #, java-format msgid "This will change {0} object." @@ -10214,14 +10257,14 @@ msgstr[0] "这会改变 {0} 个对象。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:214 msgid "An empty value deletes the tag." msgstr "空白的数值代表删除该标签。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:257 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:308 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:334 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:636 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:710 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:263 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:720 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:164 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:173 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:309 @@ -10233,18 +10276,18 @@ msgstr "<不同>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:277 msgid "Change value?" msgid_plural "Change values?" msgstr[0] "改变数值？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:323 msgid "Overwrite key" msgstr "覆盖设定键" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:324 msgid "Replace" msgstr "替换" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:326 #, java-format msgid "" @@ -10255,5 +10298,5 @@ "新的设定键已在使用，覆盖数值吗？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:336 #, java-format @@ -10262,5 +10305,5 @@ msgstr[0] "改变属性至 {0} 个对象" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:411 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:417 #, java-format msgid "This will change up to {0} object." @@ -10268,31 +10311,31 @@ msgstr[0] "这会改变 {0} 个对象。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:413 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:419 msgid "Please select a key" msgstr "请选择一个设定键" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450 msgid "Please select a value" msgstr "请选择一个数值" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:471 msgid "Add value?" msgstr "添加数值？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:548 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:554 msgid "Please select the objects you want to change properties for." msgstr "请选择您要改变属性的对象。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:607 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:608 msgid "Properties/Memberships" msgstr "属性/成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:601 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:607 msgid "Properties for selected objects." msgstr "选定对象的属性。" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:82 msgid "Member Of" @@ -10301,64 +10344,88 @@ #. #. item "Facilities/Fire Hydrant" combo "Position" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:651 -#: build/trans_presets.java:2746 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:661 +#: build/trans_presets.java:2747 msgid "Position" msgstr "位置" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "属性：{0}/成员：{1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978 msgid "Properties / Memberships" msgstr "属性/成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1021 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1031 msgid "Change relation" msgstr "改变关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032 msgid "Delete from relation" msgstr "自关系中删除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1034 #, java-format msgid "Really delete selection from relation {0}?" msgstr "确定要删除关系 {0} 的选择范围？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1046 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056 msgid "Delete the selected key in all objects" msgstr "删除所有对象中选定的设定键" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1048 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1058 msgid "Delete Properties" msgstr "删除属性" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1089 msgid "Add a new key/value pair to all objects" msgstr "将新的设定键/数值配对添加到所有的对象" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1091 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101 msgid "Edit the value of the selected key for all objects" msgstr "编辑所有对象选定设定键的数值" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1132 msgid "Go to OSM wiki for tag help (F1)" msgstr "转到 OSM 的维基页面查看标签的帮助内容 (F1)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1123 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1133 #: ../plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java:25 msgid "Launch browser with wiki help for selected object" msgstr "启动浏览器并显示选定对象的维基说明" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1233 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:17 msgid "Select relation in main selection." msgstr "选择主要选择范围的关系。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261 msgid "Select the members of selected relation" msgstr "选择选定关系的成员" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1333 +msgid "Copy Value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1334 +msgid "Copy the value of the selected tag to clipboard" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1346 +msgid "Copy Key/Value" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1347 +msgid "Copy the key and value of the selected tag to clipboard" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1360 +msgid "Copy all Keys/Values" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1361 +msgid "Copy the key and value of the all tags to clipboard" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:175 @@ -10852,57 +10919,57 @@ "度)：" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 #: ../plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/dialogs/AccessParameterDialog.java:345 msgid "Create bookmark" msgstr "建立书签" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" msgstr "将目前选定的下载区域添加到书签" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." msgstr "目前并未选定任何下载区域。请先选择一个区域。" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248 msgid "Please enter a name for the bookmarked download area." msgstr "请为此下载区域书签输入一个名称。" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249 msgid "Name of location" msgstr "位置的名称" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" msgstr "删除目前选定的书签" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237 msgid "Rename the currently selected bookmark" msgstr "重新命名目前选定的书签" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:103 msgid "min lat" msgstr "最小纬度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105 msgid "min lon" msgstr "最小经度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107 msgid "max lat" msgstr "最大纬度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109 msgid "max lon" msgstr "最大经度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112 msgid "Clear textarea" msgstr "清除文本区" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:120 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -10910,10 +10977,10 @@ msgstr "www.openstreetmap.org 的 URL (您可以在这里粘贴 URL 下载该区域)" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:152 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:153 msgid "Bounding Box" msgstr "绑定方块" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:226 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:227 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:259 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:157 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:197 @@ -10922,15 +10989,15 @@ msgstr "字串“{0}”不是一个合格的 double 数值。" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:230 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:231 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:161 msgid "Value for latitude in range [-90,90] required." msgstr "纬度的数值范围必须为[-90,90]。" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:262 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:263 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:201 msgid "Value for longitude in range [-180,180] required." msgstr "经度的数值范围必须为[-180,180]。" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:301 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:232 msgid "Paste URL from clipboard" @@ -11011,13 +11078,4 @@ msgid "Bounds" msgstr "边界" - -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75 -msgid "Near" -msgstr "靠近" - -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75 -msgctxt "placeselection" -msgid "Zoom" -msgstr "缩放" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:102 @@ -11065,7 +11123,12 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" #. item "Waypoints/Traffic Calming" combo "Type" +#. +#. +#. +#. item "Barriers/Fence" combo "Type" #. item "Water/Water/Wetland" combo "Type" #. item "Car/Parking" combo "Type" #. item "Motorcycle/Parking" combo "Type" +#. item "Bicycle/Parking" combo "Type" #. item "Culture/Recording Studio" combo "Type" #. item "Facilities/Recycling" combo "Type" @@ -11081,12 +11144,13 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441 #: build/specialmessages.java:84 build/trans_presets.java:480 -#: build/trans_presets.java:799 build/trans_presets.java:808 -#: build/trans_presets.java:1212 build/trans_presets.java:1592 -#: build/trans_presets.java:1705 build/trans_presets.java:2460 -#: build/trans_presets.java:2695 build/trans_presets.java:2739 -#: build/trans_presets.java:2967 build/trans_presets.java:2976 -#: build/trans_presets.java:3136 build/trans_presets.java:3252 -#: build/trans_presets.java:4012 build/trans_presets.java:4022 -#: build/trans_presets.java:4031 +#: build/trans_presets.java:809 build/trans_presets.java:818 +#: build/trans_presets.java:955 build/trans_presets.java:1211 +#: build/trans_presets.java:1591 build/trans_presets.java:1704 +#: build/trans_presets.java:1737 build/trans_presets.java:2461 +#: build/trans_presets.java:2696 build/trans_presets.java:2740 +#: build/trans_presets.java:2968 build/trans_presets.java:2977 +#: build/trans_presets.java:3137 build/trans_presets.java:3253 +#: build/trans_presets.java:4013 build/trans_presets.java:4023 +#: build/trans_presets.java:4032 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:98 @@ -11181,4 +11245,6 @@ #. putValue(NAME, tr("Back")); #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:449 +#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:482 +#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:482 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:482 msgid "Go to the previous page" @@ -11216,5 +11282,5 @@ msgstr "经度： " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:138 msgid "Coordinates" msgstr "坐标" @@ -11239,10 +11305,10 @@ msgstr "重新加载服务器的历史记录" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283 msgid "History not initialized yet. Failed to set reference primitive." msgstr "历史记录尚未初始化。设定参照原型失败。" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:285 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:315 #, java-format msgid "" @@ -11250,5 +11316,5 @@ msgstr "设定参照失败。参照 ID {0} 与历史记录 ID {1} 不符。" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:282 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:288 #, java-format msgid "" @@ -11256,9 +11322,9 @@ msgstr "设定参照失败。参照版本 {0} 在历史记录中无法使用。" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:313 msgid "History not initialized yet. Failed to set current primitive." msgstr "历史记录尚未初始化。设定目前的原型失败。" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:318 #, java-format msgid "" @@ -11340,13 +11406,13 @@ msgstr "版本 {0} 建立于 {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:123 msgid "Changeset info" msgstr "修改集合信息" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:124 msgid "Launch browser with information about the changeset" msgstr "启动浏览器并显示这个修改集合的信息" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138 +#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:143 #, java-format msgid "Show changeset {0}" @@ -11930,5 +11996,5 @@ #. item "Transport/Railway/Bus Guideway" combo "Layer" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910 #: build/trans_presets.java:117 build/trans_presets.java:135 #: build/trans_presets.java:155 build/trans_presets.java:175 @@ -11940,11 +12006,11 @@ #: build/trans_presets.java:430 build/trans_presets.java:488 #: build/trans_presets.java:504 build/trans_presets.java:520 -#: build/trans_presets.java:545 build/trans_presets.java:585 -#: build/trans_presets.java:606 build/trans_presets.java:641 -#: build/trans_presets.java:665 build/trans_presets.java:690 -#: build/trans_presets.java:710 build/trans_presets.java:731 -#: build/trans_presets.java:1086 build/trans_presets.java:1094 -#: build/trans_presets.java:1102 build/trans_presets.java:1110 -#: build/trans_presets.java:1121 build/trans_presets.java:1398 +#: build/trans_presets.java:555 build/trans_presets.java:595 +#: build/trans_presets.java:616 build/trans_presets.java:651 +#: build/trans_presets.java:675 build/trans_presets.java:700 +#: build/trans_presets.java:720 build/trans_presets.java:741 +#: build/trans_presets.java:1085 build/trans_presets.java:1093 +#: build/trans_presets.java:1101 build/trans_presets.java:1109 +#: build/trans_presets.java:1120 build/trans_presets.java:1397 msgid "Layer" msgstr "层" @@ -11964,5 +12030,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:499 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:504 msgid "Upload" msgstr "上传" @@ -11985,5 +12051,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:123 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:275 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:84 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:87 @@ -11996,5 +12062,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:127 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:490 msgid "Tags of new changeset" msgstr "新修改集合的标签" @@ -12013,30 +12079,30 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:177 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:501 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:506 #, java-format msgid "Upload to ''{0}''" msgstr "上传到“{0}”" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371 msgid "Upload Changes" msgstr "上传修改" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373 msgid "Upload the changed primitives" msgstr "上传已修改的原型" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:382 msgid "Please revise upload comment" msgstr "请修改上传注解" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383 msgid "Revise" msgstr "修改" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:383 msgid "Continue as is" msgstr "就这样继续" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:380 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:385 msgid "" "Your upload comment is empty, or very short.

This " @@ -12051,33 +12117,33 @@ "改，就可以让其他
众多制图者更好做事。" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:395 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:400 msgid "Return to the previous dialog to enter a more descriptive comment" msgstr "返回到上一个对话框中输入一个更具描述性的注释" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:396 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401 msgid "Cancel and return to the previous dialog" msgstr "取消并返回到上一个对话框" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:397 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402 msgid "Ignore this hint and upload anyway" msgstr "忽略这个提示，强制上传" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:405 msgid "Do not show this message again" msgstr "不再显示此消息" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413 msgid "Please enter a valid chunk size first" msgstr "请先输入有效的区块大小" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:414 msgid "Illegal chunk size" msgstr "不合法的区块大小" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:445 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450 msgid "Cancel the upload and resume editing" msgstr "取消上传并继续编辑" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:487 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 #, java-format msgid "Tags of changeset {0}" @@ -12440,5 +12506,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993 -#: build/trans_presets.java:4334 build/trans_presets.java:4364 +#: build/trans_presets.java:4336 build/trans_presets.java:4366 #: ../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:229 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137 @@ -12804,5 +12870,5 @@ msgstr "发现下列问题：" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:324 #, java-format msgid "" @@ -12815,65 +12881,65 @@ "请更改投影法，或者删除图层。" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:343 msgid "Auto Zoom" msgstr "自动缩放" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:361 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:354 msgid "Auto load tiles" msgstr "自动加载拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:372 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:365 msgid "Show Errors" msgstr "显示错误" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:381 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:374 msgid "Load Tile" msgstr "加载拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:392 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:385 msgid "Show Tile Info" msgstr "显示拼贴信息" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:415 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:408 msgid "Load All Tiles" msgstr "加载所有拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:424 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:417 msgid "Load All Error Tiles" msgstr "加载所有错误的拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:434 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:427 msgid "Increase zoom" msgstr "增加缩放" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:443 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:436 msgid "Decrease zoom" msgstr "减少缩放" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:447 msgid "Snap to tile size" msgstr "贴紧拼贴大小" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:465 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:458 msgid "Flush Tile Cache" msgstr "清除拼贴缓存" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1310 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1289 msgid "zoom in to load any tiles" msgstr "放大以加载拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1312 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1291 msgid "zoom in to load more tiles" msgstr "放大以加载更多拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1293 msgid "increase zoom level to see more detail" msgstr "缩小以查看更多信息" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1297 msgid "No tiles at this zoom level" msgstr "在此缩放等级没有拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1401 +#: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:1380 msgid "EPSG:4326 and Mercator projection are supported" msgstr "支持 EPSG:4326 和麦卡托投影法" @@ -12888,106 +12954,77 @@ msgstr "没有验证错误" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:153 -#, java-format -msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" -msgstr "警告：WMS 图层已停用，因为基础 URL“{0}”出现异常" - -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:155 -msgid "(deactivated)" -msgstr "(不使用)" - -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:211 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:194 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS 图层 ({0})，于缩放 {1} 自动下载" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:213 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:196 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS 图层 ({0})，于缩放 {1} 下载" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:254 -#, java-format -msgid "" -"The base URL
''{0}''
for this WMS layer does neither end with a " -"''&'' nor with a ''?''.
This is likely to lead to invalid WMS request. " -"You should check your
preference settings.
Do you want to fetch WMS " -"tiles anyway?" -msgstr "" -"这个 WMS 图层的基础 URL
“{0}”
不是以“&”或“?”结尾。
这有可能导" -"致无效的 WMS 请求。您应该检查您的
首选项。
您想强制获取 WMS 的拼贴吗？" -"" - -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:262 -msgid "Yes, fetch images" -msgstr "是，获取图片" - -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:268 -msgid "Invalid URL?" -msgstr "无效的 URL？" - -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:564 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:518 msgid "Download visible tiles" msgstr "下载可见的拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:571 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:525 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" msgstr "要求的区域太大。请放大一点，或是更改分辨率" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:583 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:537 msgid "Change resolution" msgstr "更改分辨率" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:632 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:586 msgid "Reload erroneous tiles" msgstr "重新加载错误的拼贴" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:653 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:607 msgid "Alpha channel" msgstr "Alpha 通道" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:638 msgid "Save WMS layer to file" msgstr "将 WMS 图层保存至文件" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:689 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:643 msgid "Save WMS layer" msgstr "保存 WMS 图层" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:713 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:667 msgid "Load WMS layer from file" msgstr "从文件加载 WMS 图层" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:672 msgid "Load WMS layer" msgstr "加载 WMS 图层" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:729 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:683 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "不支持的 WMS 文件版本；发现 {0}，应为 {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:730 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:684 msgid "File Format Error" msgstr "文件格式错误" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:721 msgid "Error loading file" msgstr "加载文件有错误" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:735 msgid "Set WMS Bookmark" msgstr "设定 WMS 书签" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:792 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:746 msgid "Automatic downloading" msgstr "自动下载" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:827 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:781 msgid "Zoom to native resolution" msgstr "缩放到原始分辨率" -#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:943 +#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:888 #, java-format msgid "Supported projections are: {0}" @@ -13358,5 +13395,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110 +#: ../plugins/gpxpoints/src/org/openstreetmap/josm/plugins/gpxpoints/GpxPointsPanel.java:91 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 +#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:497 +#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:497 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:497 msgid "Next" @@ -13556,4 +13596,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60 +#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97 msgid "Save Access Token in preferences" msgstr "在首选项中保存访问令牌" @@ -13715,4 +13756,6 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:359 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274 +#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:480 +#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:480 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:480 msgid "Back" @@ -13798,8 +13841,4 @@ "server ''{0}''." msgstr "请输入已获授权访问 OSM 服务器“{0}”的 OAuth 访问令牌。" - -#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97 -msgid "Save Access Token to preferences" -msgstr "将访问令牌保存到首选项" #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118 @@ -14173,26 +14212,26 @@ msgstr "正在取回用户信息..." -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:87 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722 msgid "Menu Name" msgstr "菜单名称" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:88 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:89 msgid "Unnamed Imagery Layer" msgstr "未命名图片图层" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:94 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:95 msgid "WMS" msgstr "WMS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:100 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:101 msgid "Service URL" msgstr "服务 URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:105 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:106 msgid "Get Layers" msgstr "获取图层" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:144 msgid "" "That layer does not support any of JOSM''s projections,\n" @@ -14202,49 +14241,48 @@ "因此您不能使用它。这条信息不会再显示。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:145 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:181 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:319 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:338 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:146 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:182 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:300 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:330 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:349 msgid "WMS Error" msgstr "WMS 错误" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:170 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:178 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:171 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:179 msgid "Show Bounds" msgstr "显示边界" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:180 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:181 msgid "No bounding box was found for this layer." msgstr "找不到这个图层的绑定方块。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:190 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:191 msgid "TMS URL" msgstr "TMS URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:204 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:205 msgctxt "layer" msgid "Zoom" msgstr "缩放" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:213 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:214 msgid "TMS" msgstr "TMS" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:215 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:216 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:722 msgid "Imagery URL" msgstr "图像 URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:296 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:299 msgid "Could not parse WMS layer list." msgstr "无法解析 WMS 图层列表。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:318 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:329 msgid "Invalid service URL." msgstr "无效的服务 URL。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:337 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:348 msgid "Could not retrieve WMS layer list." msgstr "无法得到 WMS 图层列表。" @@ -14456,5 +14494,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:149 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125 #, java-format msgid "Choose a color for {0}" @@ -14590,5 +14628,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:37 #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:43 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:145 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21 @@ -14656,5 +14694,5 @@ #. group "Car" #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57 -#: build/trans_presets.java:1584 +#: build/trans_presets.java:1583 msgid "Car" msgstr "汽车" @@ -14680,14 +14718,14 @@ #. item "Public Transport/Subway Entrance" check "Bicycle" #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57 -#: build/trans_presets.java:452 build/trans_presets.java:579 -#: build/trans_presets.java:870 build/trans_presets.java:880 -#: build/trans_presets.java:889 build/trans_presets.java:901 -#: build/trans_presets.java:915 build/trans_presets.java:937 -#: build/trans_presets.java:980 build/trans_presets.java:993 -#: build/trans_presets.java:1005 build/trans_presets.java:1017 -#: build/trans_presets.java:1029 build/trans_presets.java:1041 -#: build/trans_presets.java:1051 build/trans_presets.java:1060 -#: build/trans_presets.java:1069 build/trans_presets.java:1731 -#: build/trans_presets.java:1811 +#: build/trans_presets.java:452 build/trans_presets.java:589 +#: build/trans_presets.java:872 build/trans_presets.java:882 +#: build/trans_presets.java:891 build/trans_presets.java:903 +#: build/trans_presets.java:917 build/trans_presets.java:939 +#: build/trans_presets.java:979 build/trans_presets.java:992 +#: build/trans_presets.java:1004 build/trans_presets.java:1016 +#: build/trans_presets.java:1028 build/trans_presets.java:1040 +#: build/trans_presets.java:1050 build/trans_presets.java:1059 +#: build/trans_presets.java:1068 build/trans_presets.java:1730 +#: build/trans_presets.java:1812 msgid "Bicycle" msgstr "单车" @@ -14726,13 +14764,13 @@ #. item "Barriers/Sally Port" check "Foot" #: ../core/src/org/openstreetmap/josm/gui/preferences/GPXSettingsPanel.java:57 -#: build/trans_presets.java:448 build/trans_presets.java:578 -#: build/trans_presets.java:869 build/trans_presets.java:879 -#: build/trans_presets.java:888 build/trans_presets.java:900 -#: build/trans_presets.java:914 build/trans_presets.java:936 -#: build/trans_presets.java:979 build/trans_presets.java:992 -#: build/trans_presets.java:1004 build/trans_presets.java:1016 -#: build/trans_presets.java:1028 build/trans_presets.java:1040 -#: build/trans_presets.java:1050 build/trans_presets.java:1059 -#: build/trans_presets.java:1068 +#: build/trans_presets.java:448 build/trans_presets.java:588 +#: build/trans_presets.java:871 build/trans_presets.java:881 +#: build/trans_presets.java:890 build/trans_presets.java:902 +#: build/trans_presets.java:916 build/trans_presets.java:938 +#: build/trans_presets.java:978 build/trans_presets.java:991 +#: build/trans_presets.java:1003 build/trans_presets.java:1015 +#: build/trans_presets.java:1027 build/trans_presets.java:1039 +#: build/trans_presets.java:1049 build/trans_presets.java:1058 +#: build/trans_presets.java:1067 msgid "Foot" msgstr "步行" @@ -14877,113 +14915,117 @@ msgstr "不正确的音频路点标签模式：{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:110 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125 msgid "imagery fade" msgstr "淡化图像" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:121 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:136 msgid "Fade Color: " msgstr "淡化颜色： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:125 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:140 msgid "Fade amount: " msgstr "淡化量： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:146 msgid "Soft" msgstr "柔和" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:132 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:147 msgid "Strong" msgstr "强烈" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:133 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:148 msgid "Sharpen (requires layer re-add): " msgstr "锐化(需要重新添加图层) " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:137 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:152 msgid "Use offset server: " msgstr "使用偏移服务器： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:174 msgid "Downloader:" msgstr "下载器：" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:165 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:180 msgid "Overlap tiles" msgstr "重叠拼贴" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:166 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:181 msgid "% of east:" msgstr "% 东：" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182 msgid "% of north:" msgstr "% 北：" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:182 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:197 msgid "Simultaneous connections" msgstr "同时连接" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:198 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:213 msgid "Auto zoom by default: " msgstr "默认情况下，自动缩放： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:202 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:217 msgid "Autoload tiles by default: " msgstr "默认情况下，自动加载拼贴： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:206 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:221 msgid "Min. zoom level: " msgstr "最小缩放级别： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:210 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:225 msgid "Max. zoom level: " msgstr "最大缩放级别： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:214 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:229 msgid "Add to slippymap chooser: " msgstr "添加到快速地图选择器： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:218 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:233 msgid "Tile cache directory: " msgstr "拼贴缓存目录： " -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:255 msgid "Common Settings" msgstr "一般设定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:256 msgid "WMS Settings" msgstr "WMS 设定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:242 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:257 msgid "TMS Settings" msgstr "TMS 设定值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266 msgid "Imagery Preferences" msgstr "图像首选项" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:251 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:266 msgid "Modify list of imagery layers displayed in the Imagery menu" msgstr "修改在图像菜单中显示的图像图层列表" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:259 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:274 msgid "Imagery providers" msgstr "图像提供者" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:261 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:276 msgid "Offset bookmarks" msgstr "偏移书签" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:406 +msgid "Imagery Background: Default" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:470 msgid "Available default entries:" msgstr "可用的预置项目：" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:428 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:504 msgid "Selected entries:" msgstr "选择的项目：" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:598 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022 @@ -14994,55 +15036,55 @@ msgstr "新增" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:447 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:599 msgid "Add a new WMS/TMS entry by entering the URL" msgstr "通过输入网址添加一个新的 WMS/TMS 条目" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:455 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:607 msgid "Add Imagery URL" msgstr "添加图像 URL" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:619 msgid "Remove entry" msgstr "删除条目" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:645 msgid "copy selected defaults" msgstr "复制选定的默认值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:512 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:664 msgid "Please select at least one row to copy." msgstr "请选择至少一列来复制。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:549 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:707 msgid "reload defaults" msgstr "重新加载默认值" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785 msgid "Menu Name (Default)" msgstr "菜单名称(默认值)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:785 msgid "Imagery URL (Default)" msgstr "图像 URL (默认值)" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:686 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:830 #, java-format msgid "EULA license URL not available: {0}" msgstr "EULA 授权 URL 无法使用：{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:700 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:844 #, java-format msgid "Malformed URL for the EULA licence: {0}" msgstr "EULA 授权的 URL 格式错误：{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910 msgid "Projection" msgstr "投影法" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910 msgid "Easting" msgstr "向东" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:910 msgid "Northing" msgstr "向北" @@ -15637,7 +15679,9 @@ msgstr "编辑来源项目：" +#. System.out.println("pref:"+addr); #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:480 +#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java:67 msgid "Reset" msgstr "重新设定" @@ -16209,5 +16253,5 @@ msgstr "添加新标签" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479 #, java-format msgid "" @@ -16217,5 +16261,5 @@ "预设标签“{0}-{1}”损坏 - 在“display_values”中的项目数量必须与“values”中的相同" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:481 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:484 #, java-format msgid "" @@ -16257,28 +16301,28 @@ msgstr "额外属性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1029 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1031 #, java-format msgid "Use preset ''{0}'' of group ''{1}''" msgstr "使用群组“{1}”中的预设组合“{0}”" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1030 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1032 #, java-format msgid "Use preset ''{0}''" msgstr "使用预设组合“{0}”" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083 #, java-format msgid "Unknown type: {0}" msgstr "不明的类型：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1150 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1171 msgid "Preset role element without parent" msgstr "预置无父元素的角色元素" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1158 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1179 msgid "Preset sub element without parent" msgstr "预置无父元素的子元素" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1198 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1219 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66 @@ -16288,15 +16332,15 @@ msgstr "无法读取标签预设组合来源：{0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1208 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1229 #, java-format msgid "Error parsing {0}: " msgstr "分析 {0} 时发生错误： " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1249 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1270 #, java-format msgid "Elements of type {0} are supported." msgstr "类型 {0} 的元件已支持。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1328 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1349 #: ../plugins/terracer/src/terracer/TerracerAction.java:212 #, java-format @@ -16305,22 +16349,22 @@ msgstr[0] "改变 {0} 个对象" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1331 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1352 msgid "Nothing selected!" msgstr "尚未选择！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1333 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1354 msgid "Selection unsuitable!" msgstr "选择范围不合适！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1343 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1364 msgid "Apply Preset" msgstr "应用预设组合" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1342 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1363 msgid "New relation" msgstr "新建关系" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1434 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1455 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122 msgid "Change Properties" @@ -16383,4 +16427,41 @@ "The current value is not a valid OSM ID. Please enter an integer value > 0" msgstr "目前的数值不是有效的 OSM ID。请输入大于 0 的整数值" + +#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:100 +#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440 +#, java-format +msgid "" +"Way with external ID ''{0}'' includes missing node with external ID ''{1}''." +msgstr "外部 ID“{0}”的路径包含了缺少的外部 ID“{1}”的节点。" + +#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:112 +#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452 +#, java-format +msgid "Deleted node {0} is part of way {1}" +msgstr "删除的节点 {0} 是路径 {1} 的一部分" + +#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:119 +#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460 +#, java-format +msgid "" +"Way {0} with {1} nodes has incomplete nodes because at least one node was " +"missing in the loaded data." +msgstr "" +"有 {1} 个节点的路径 {0} 有不完整的节点，因为在加载的数据中至少有一个节点遗失" +"了。" + +#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:161 +#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516 +#, java-format +msgid "" +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." +msgstr "外部 id“{0}”的关系包含了缺少的外部 id“{1}”的原型。" + +#: ../core/src/org/openstreetmap/josm/io/AbstractReader.java:185 +#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540 +#, java-format +msgid "Deleted member {0} is used by relation {1}" +msgstr "删除的成员 {0} 正由关系 {1} 使用" #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15 @@ -16970,5 +17051,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:84 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:104 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:143 @@ -17087,5 +17168,4 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:158 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:100 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:139 @@ -17096,5 +17176,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:165 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:87 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:107 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:146 @@ -17122,4 +17202,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:80 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 @@ -17165,14 +17246,14 @@ msgstr "文件“{0}”不存在" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:57 #, java-format msgid "No data found in file {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:58 msgid "Open OSM file" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:160 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:170 #, java-format @@ -17184,10 +17265,11 @@ "maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:201 -msgid "Found XML element not as direct child of element ." -msgstr "发现 XML 元素 并未做为元素 的直接子项。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:196 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 +#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:216 +#, java-format +msgid "Deleted way {0} contains nodes" +msgstr "删除的路径 {0} 包含节点" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206 @@ -17196,5 +17278,5 @@ msgstr "路径 {1} 的 缺少必要的属性“{0}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:153 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:188 @@ -17204,16 +17286,11 @@ msgstr "元素 的属性“ref”有不合法的数值。得到 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:216 -#, java-format -msgid "Deleted way {0} contains nodes" -msgstr "删除的路径 {0} 包含节点" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:237 -msgid "Found XML element not as direct child of element ." -msgstr "发现 XML 元素 并未做为元素 的直接子项。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:267 +#, java-format +msgid "Deleted relation {0} contains members" +msgstr "删除的关系 {0} 包含成员" + +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243 #, java-format @@ -17221,5 +17298,5 @@ msgstr "在关系 {0} 的成员缺少属性 \"ref\"。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:248 #, java-format @@ -17227,5 +17304,5 @@ msgstr "在关系 {0} 的成员属性 \"ref\"有不合法的数值。得到 {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:193 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:252 @@ -17234,5 +17311,5 @@ msgstr "在关系 {1} 的成员 {0} 缺少属性“type”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:247 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:199 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:257 @@ -17242,21 +17319,15 @@ msgstr "在关系 {1} 的成员 {0} 属性“type”有不合法的数值。得到 {2}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:263 msgid "Incomplete specification with ref=0" msgstr "不完整的 规格，ref=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:267 -#, java-format -msgid "Deleted relation {0} contains members" -msgstr "删除的关系 {0} 包含成员" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:221 msgid "Missing key or value attribute in tag." msgstr "标签中缺少设定键或数值属性。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280 @@ -17265,5 +17336,5 @@ msgstr "在输入串流中发现未定义的元素“{0}”。正在跳过。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:305 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308 @@ -17271,6 +17342,6 @@ msgstr "不合法的对象，id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:331 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:335 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334 @@ -17283,8 +17354,8 @@ #. default version in 0.5 files for existing primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345 @@ -17299,5 +17370,5 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:413 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353 #, java-format @@ -17305,5 +17376,5 @@ msgstr "不明或不支持的 API 版本。得到 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:419 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359 #, java-format @@ -17312,6 +17383,6 @@ #. for a new primitive we just log a warning -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:461 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388 @@ -17325,6 +17396,6 @@ #. for an existing primitive this is a problem -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:392 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391 @@ -17335,5 +17406,5 @@ msgstr "属性“changeset”有不合法的数值。得到“{0}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:411 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:474 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414 @@ -17342,5 +17413,5 @@ msgstr "缺少必要的属性“{0}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419 @@ -17349,54 +17420,19 @@ msgstr "属性“{0}”有不合法的 long 数值。得到“{1}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:437 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:440 -#, java-format -msgid "" -"Way with external ID ''{0}'' includes missing node with external ID ''{1}''." -msgstr "外部 ID“{0}”的路径包含了缺少的外部 ID“{1}”的节点。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:449 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:452 -#, java-format -msgid "Deleted node {0} is part of way {1}" -msgstr "删除的节点 {0} 是路径 {1} 的一部分" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:460 -#, java-format -msgid "" -"Way {0} with {1} nodes has incomplete nodes because at least one node was " -"missing in the loaded data." -msgstr "" -"有 {1} 个节点的路径 {0} 有不完整的节点，因为在加载的数据中至少有一个节点遗失" -"了。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:511 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:516 -#, java-format -msgid "" -"Relation with external id ''{0}'' refers to a missing primitive with " -"external id ''{1}''." -msgstr "外部 id“{0}”的关系包含了缺少的外部 id“{1}”的原型。" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:535 -#: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:540 -#, java-format -msgid "Deleted member {0} is used by relation {1}" -msgstr "删除的成员 {0} 正由关系 {1} 使用" - -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:561 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:541 +#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:250 msgid "Prepare OSM data..." msgstr "准备 OSM 数据..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:542 msgid "Parsing OSM data..." msgstr "正在分析 OSM 数据..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550 +#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:256 msgid "Preparing data set..." msgstr "正在准备数据集合..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:584 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:566 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221 @@ -17550,4 +17586,33 @@ msgstr "发现意外的 id 0 osm 原型" +#: ../core/src/org/openstreetmap/josm/io/PbfImporter.java:21 +#, fuzzy +msgid "OSM Server Files PBF compressed" +msgstr "OSM 服务器文件(以 gzip 压缩)" + +#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:57 +#, fuzzy, java-format +msgid "Invalid coordinates: {0}" +msgstr "零坐标：{0}" + +#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:63 +#, fuzzy, java-format +msgid "Invalid changeset id: {0}" +msgstr "正在关闭修改集合 {0}" + +#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:69 +#, fuzzy, java-format +msgid "Invalid timestamp: {0}" +msgstr "无效 URL {0}" + +#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:112 +msgid "Invalid DenseNodes key/values table" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:251 +#, fuzzy +msgid "Reading OSM data..." +msgstr "正在分析 OSM 数据..." + #: ../core/src/org/openstreetmap/josm/io/WMSLayerExporter.java:11 #: ../core/src/org/openstreetmap/josm/io/WMSLayerImporter.java:11 @@ -17571,11 +17636,4 @@ msgstr "保存用户与密码(未加密)" -#: ../core/src/org/openstreetmap/josm/io/imagery/ImageryReader.java:103 -#, java-format -msgid "" -"Warning: Could not detect type of imagery source ''{0}''. Using default " -"(xml)." -msgstr "警告：无法检测到图像源“{0}”的类型。正在使用默认(XML)。" - #: ../core/src/org/openstreetmap/josm/io/imagery/OsmosnimkiOffsetServer.java:29 #, java-format @@ -17592,31 +17650,4 @@ msgid "Querying offset: {0}" msgstr "查询偏移中：{0}" - -#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:147 -#, java-format -msgid "" -"Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing " -"''&'' or a trailing ''?''." -msgstr "警告：WMS 服务基础 URL“{0}”没有以“&”或“？”结尾。" - -#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:148 -msgid "" -"Warning: Fetching WMS tiles is likely to fail. Please check you preference " -"settings." -msgstr "警告：取回 WMS 拼贴似乎失败了。请检查您的首选项值。" - -#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:149 -#, java-format -msgid "Warning: The complete URL is ''{0}''." -msgstr "警告：完整 URL 为“{0}”。" - -#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:196 -#, java-format -msgid "" -"The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n" -"This may lead to wrong coordinates." -msgstr "" -"URL 中的投影“{0}”与目前的投影“{1}”不符。\n" -"这可能会导致错误的坐标。" #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45 @@ -18410,10 +18441,10 @@ "

错误的信息为：
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:629 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:630 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." msgstr "找不到地区设定 {0} 的翻译。回复为 {1}。" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:82 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:90 #: ../core/src/org/openstreetmap/josm/tools/ImageRequest.java:81 #, java-format @@ -18423,5 +18454,5 @@ msgstr "严重的错误：无法定位图片“{0}”。这是严重的配置问题。JOSM 会停止运作。" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:283 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:330 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:110 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java:192 @@ -18430,6 +18461,6 @@ msgstr "警告：无法处理 zip 文件“{0}”。异常为：{1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:340 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:354 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:387 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:401 #, java-format msgid "" @@ -18464,5 +18495,5 @@ msgstr "未使用" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:498 #, java-format msgid "" @@ -18475,5 +18506,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:463 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:503 msgid "" "This action will have no shortcut.\n" @@ -18483,5 +18514,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:465 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:505 #, java-format msgid "" @@ -18492,5 +18523,5 @@ "\n" -#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:467 +#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:507 msgid "(Hint: You can edit the shortcuts in the preferences.)" msgstr "(提示：您可以在首选项中编辑快捷键。)" @@ -19136,16 +19167,21 @@ msgstr "允许您过滤掉不必要的 GPS 轨迹" +#. Plugin GpxPoints +#: build/trans_plugins.java:49 +msgid "Plugin for walking through waypoints in opened GPX files" +msgstr "" + #. Plugin graphview -#: build/trans_plugins.java:49 +#: build/trans_plugins.java:51 msgid "Visualizes routing information as a routing graph." msgstr "以路线图显示视觉化路线信息。" #. Plugin imageryadjust -#: build/trans_plugins.java:51 +#: build/trans_plugins.java:53 msgid "WMSPlugin-style imagery adjustment mapmode" msgstr "WMSPlugin-样式图片调整地图模式" #. Plugin ImageWayPoint -#: build/trans_plugins.java:53 +#: build/trans_plugins.java:55 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -19157,15 +19193,15 @@ #. Plugin ImportImagePlugin -#: build/trans_plugins.java:55 build/trans_plugins.java:57 +#: build/trans_plugins.java:57 build/trans_plugins.java:59 msgid "Plugin for importing spatial referenced images" msgstr "用来导入空间参照图片的外挂程式" #. Plugin importvec -#: build/trans_plugins.java:59 +#: build/trans_plugins.java:61 msgid "Import vector graphics (SVG)" msgstr "导入矢量图形(SVG)" #. Plugin ImproveWayAccuracy -#: build/trans_plugins.java:61 +#: build/trans_plugins.java:63 msgid "" "Can be useful when you are improving accuracy of existing ways. The idea of " @@ -19175,5 +19211,5 @@ #. Plugin InfoMode -#: build/trans_plugins.java:63 +#: build/trans_plugins.java:65 msgid "" "Extra information about current layer objects pop ups - currently GPX " @@ -19182,10 +19218,10 @@ #. Plugin irsrectify -#: build/trans_plugins.java:65 +#: build/trans_plugins.java:67 msgid "A helper for IRS satellite adjustment." msgstr "IRS 卫星调整协助程序" #. Plugin junctionchecking -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:69 msgid "" "creates a channel digraph and checks a subset of channels if it is a " @@ -19194,10 +19230,10 @@ #. Plugin lakewalker -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:71 msgid "Helps vectorizing WMS images." msgstr "帮助将 WMS 图片矢量化。" #. Plugin licensechange -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:73 msgid "" "Checks if all users contributing to an object have agreed to the license " @@ -19206,5 +19242,5 @@ #. Plugin livegps -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:75 msgid "" "Support live GPS input (moving dot) through a connection to gpsd server." @@ -19212,5 +19248,5 @@ #. Plugin mapdust -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:77 msgid "" "The MapDust Plug-In shows the MapDust bug reports on the map. You can " @@ -19222,5 +19258,5 @@ #. Plugin measurement -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:79 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -19232,25 +19268,25 @@ #. Plugin merge-overlap -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:81 msgid "Merge overlapping part of ways." msgstr "" #. Plugin michigan_left -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:83 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "为 4 或 5 条路径添加禁止左转" #. Plugin multipoly-convert -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:85 msgid "Simply convert an area to a multipolygon." msgstr "简单地用多重多边形覆盖一个区域。" #. Plugin namemanager -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:87 msgid "Allows to attribute tags to all objects in any selected area at once" msgstr "允许在任何选定区域中，一次性给所有的对象添加标签" #. Plugin native_password_manager -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:89 msgid "" "Use your system''s password manager to store the API username and password. " @@ -19261,5 +19297,5 @@ #. Plugin nearclick -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:91 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -19271,15 +19307,15 @@ #. Plugin OpeningHoursEditor -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:93 msgid "extended options for editing opening_hours" msgstr "扩展 opening_hours 的编辑选项" #. Plugin openstreetbugs -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:95 msgid "Imports issues from OpenStreetBugs" msgstr "导入 OpenStreetBugs 的议题" #. Plugin openvisible -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:97 msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" @@ -19287,5 +19323,5 @@ #. Plugin osmarender -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:99 msgid "" "Launches FireFox to display the current visible screen as a nice SVG image." @@ -19293,10 +19329,10 @@ #. Plugin pdfimport -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:101 msgid "Import PDF file and convert to ways." msgstr "导入 PDF 文件并转换为路径。" #. Plugin photo_geotagging -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:103 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -19306,5 +19342,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:105 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -19313,15 +19349,15 @@ #. Plugin plastic_laf -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:107 msgid "The great JGoodies Plastic Look and Feel." msgstr "超棒的 JGoodies 塑胶外观与感觉。" #. Plugin proj4j -#: build/trans_plugins.java:107 +#: build/trans_plugins.java:109 msgid "adds projections from Proj4J" msgstr "从 Proj4J 添加投影法" #. Plugin public_transport -#: build/trans_plugins.java:109 +#: build/trans_plugins.java:111 msgid "" "This plugin simplifies the mapping and editing of public transport routes." @@ -19329,25 +19365,25 @@ #. Plugin reltoolbox -#: build/trans_plugins.java:111 +#: build/trans_plugins.java:113 msgid "Relation and multipolygon creating and editing panel." msgstr "关系及多重多边形的创建和编辑面板。" #. Plugin restart -#: build/trans_plugins.java:113 +#: build/trans_plugins.java:115 msgid "Adds "Restart JOSM" item to File menu." msgstr "添加 "重启 JOSM" 项目到文件菜单。" #. Plugin reverter -#: build/trans_plugins.java:115 +#: build/trans_plugins.java:117 msgid "Plugin for reverting changesets" msgstr "还原修改集合的插件" #. Plugin rgisopen -#: build/trans_plugins.java:117 +#: build/trans_plugins.java:119 msgid "Use rgis.spb.ru image as overlay" msgstr "使用 rgis.spb.ru 图片做为覆盖" #. Plugin RoadSigns -#: build/trans_plugins.java:119 +#: build/trans_plugins.java:121 msgid "" "Plugin for tagging of objects based on a selection of road signs. The dialog " @@ -19359,5 +19395,5 @@ #. Plugin routes -#: build/trans_plugins.java:121 +#: build/trans_plugins.java:123 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -19368,10 +19404,10 @@ #. Plugin routing -#: build/trans_plugins.java:123 +#: build/trans_plugins.java:125 msgid "Provides routing capabilities." msgstr "提供路线规划功能。" #. Plugin SimplifyArea -#: build/trans_plugins.java:125 +#: build/trans_plugins.java:127 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -19383,20 +19419,20 @@ #. Plugin smed #. Plugin smed_fw -#: build/trans_plugins.java:127 build/trans_plugins.java:129 +#: build/trans_plugins.java:129 build/trans_plugins.java:131 msgid "Create and edit seamaps for OpenSeaMap" msgstr "建立并编辑 OpenSeaMap 海图" #. Plugin surveyor -#: build/trans_plugins.java:131 +#: build/trans_plugins.java:133 msgid "Allow adding markers/nodes on current gps positions." msgstr "允许在目前的 gps 位置添加标记/节点。" #. Plugin tageditor -#: build/trans_plugins.java:133 +#: build/trans_plugins.java:135 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "提供在表格线中编辑标签的对话框。" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:135 +#: build/trans_plugins.java:137 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -19408,15 +19444,15 @@ #. Plugin terracer -#: build/trans_plugins.java:137 +#: build/trans_plugins.java:139 msgid "Make terraced houses out of single blocks." msgstr "让连栋房屋能超出单一区块。" #. Plugin SeaMapEditor -#: build/trans_plugins.java:139 +#: build/trans_plugins.java:141 msgid "Create and edit seamarks for OpenSeaMap" msgstr "建立并编辑 OpenSeaMap 海上航标" #. Plugin touchscreenhelper -#: build/trans_plugins.java:141 +#: build/trans_plugins.java:143 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -19425,5 +19461,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:143 +#: build/trans_plugins.java:145 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -19432,10 +19468,10 @@ #. Plugin trustosm -#: build/trans_plugins.java:145 +#: build/trans_plugins.java:147 msgid "Plugin to digital sign OSM-Data" msgstr "用来数字签名 OSM-数据的插件" #. Plugin turnlanes -#: build/trans_plugins.java:147 +#: build/trans_plugins.java:149 msgid "" "Provides a straightforward GUI for adding, editing and deleting turn lanes." @@ -19443,5 +19479,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:149 +#: build/trans_plugins.java:151 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -19451,15 +19487,15 @@ #. Plugin undelete -#: build/trans_plugins.java:151 +#: build/trans_plugins.java:153 msgid "Allows undeleting object from OSM database" msgstr "允许从 OSM 数据库中取消删除对象" #. Plugin utilsplugin2 -#: build/trans_plugins.java:153 +#: build/trans_plugins.java:155 msgid "Several utilities that make your life easier." msgstr "许多让您的生活更轻松的公用程序。" #. Plugin videomapping -#: build/trans_plugins.java:155 +#: build/trans_plugins.java:157 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -19471,5 +19507,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:157 +#: build/trans_plugins.java:159 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -19480,20 +19516,20 @@ #. Plugin waydownloader -#: build/trans_plugins.java:159 +#: build/trans_plugins.java:161 msgid "Easy downloading along a long set of interconnected ways" msgstr "方便的下载一整组互相联结的路径" #. Plugin waypoint_search -#: build/trans_plugins.java:161 +#: build/trans_plugins.java:163 msgid "Enables searching for waypoint imported from gpx file." msgstr "为从 GPX 文件导入的路点开启搜索功能。" #. Plugin wayselector -#: build/trans_plugins.java:163 +#: build/trans_plugins.java:165 msgid "Select a sequence of non-branching connected ways" msgstr "选择一整列无分支的路径" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:165 +#: build/trans_plugins.java:167 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -19658,9 +19694,9 @@ #: build/trans_presets.java:173 build/trans_presets.java:194 #: build/trans_presets.java:236 build/trans_presets.java:258 -#: build/trans_presets.java:1888 build/trans_presets.java:1896 -#: build/trans_presets.java:1904 build/trans_presets.java:1938 -#: build/trans_presets.java:2743 build/trans_presets.java:3284 -#: build/trans_presets.java:3300 build/trans_presets.java:4332 -#: build/trans_presets.java:4362 +#: build/trans_presets.java:1889 build/trans_presets.java:1897 +#: build/trans_presets.java:1905 build/trans_presets.java:1939 +#: build/trans_presets.java:2744 build/trans_presets.java:3285 +#: build/trans_presets.java:3301 build/trans_presets.java:4334 +#: build/trans_presets.java:4364 msgid "Reference" msgstr "编号" @@ -19713,6 +19749,6 @@ #: build/trans_presets.java:433 build/trans_presets.java:463 #: build/trans_presets.java:505 build/trans_presets.java:521 -#: build/trans_presets.java:586 build/trans_presets.java:607 -#: build/trans_presets.java:1400 +#: build/trans_presets.java:596 build/trans_presets.java:617 +#: build/trans_presets.java:1399 msgid "Max. speed (km/h)" msgstr "限速(km/h)" @@ -19761,9 +19797,9 @@ #: build/trans_presets.java:403 build/trans_presets.java:424 #: build/trans_presets.java:443 build/trans_presets.java:483 -#: build/trans_presets.java:544 build/trans_presets.java:577 -#: build/trans_presets.java:600 build/trans_presets.java:622 -#: build/trans_presets.java:634 build/trans_presets.java:659 -#: build/trans_presets.java:683 build/trans_presets.java:725 -#: build/trans_presets.java:1393 +#: build/trans_presets.java:554 build/trans_presets.java:587 +#: build/trans_presets.java:610 build/trans_presets.java:632 +#: build/trans_presets.java:644 build/trans_presets.java:669 +#: build/trans_presets.java:693 build/trans_presets.java:735 +#: build/trans_presets.java:1392 msgid "Oneway" msgstr "单行道" @@ -19813,9 +19849,9 @@ #: build/trans_presets.java:425 build/trans_presets.java:484 #: build/trans_presets.java:494 build/trans_presets.java:501 -#: build/trans_presets.java:539 build/trans_presets.java:572 -#: build/trans_presets.java:601 build/trans_presets.java:635 -#: build/trans_presets.java:660 build/trans_presets.java:684 -#: build/trans_presets.java:704 build/trans_presets.java:726 -#: build/trans_presets.java:1394 build/trans_surveyor.java:12 +#: build/trans_presets.java:549 build/trans_presets.java:582 +#: build/trans_presets.java:611 build/trans_presets.java:645 +#: build/trans_presets.java:670 build/trans_presets.java:694 +#: build/trans_presets.java:714 build/trans_presets.java:736 +#: build/trans_presets.java:1393 build/trans_surveyor.java:12 msgid "Bridge" msgstr "桥" @@ -19856,9 +19892,9 @@ #: build/trans_presets.java:369 build/trans_presets.java:405 #: build/trans_presets.java:426 build/trans_presets.java:485 -#: build/trans_presets.java:511 build/trans_presets.java:540 -#: build/trans_presets.java:573 build/trans_presets.java:602 -#: build/trans_presets.java:636 build/trans_presets.java:661 -#: build/trans_presets.java:685 build/trans_presets.java:705 -#: build/trans_presets.java:727 build/trans_presets.java:1395 +#: build/trans_presets.java:511 build/trans_presets.java:550 +#: build/trans_presets.java:583 build/trans_presets.java:612 +#: build/trans_presets.java:646 build/trans_presets.java:671 +#: build/trans_presets.java:695 build/trans_presets.java:715 +#: build/trans_presets.java:737 build/trans_presets.java:1394 msgid "Tunnel" msgstr "隧道" @@ -19897,9 +19933,9 @@ #: build/trans_presets.java:370 build/trans_presets.java:406 #: build/trans_presets.java:427 build/trans_presets.java:486 -#: build/trans_presets.java:541 build/trans_presets.java:574 -#: build/trans_presets.java:603 build/trans_presets.java:637 -#: build/trans_presets.java:662 build/trans_presets.java:686 -#: build/trans_presets.java:706 build/trans_presets.java:728 -#: build/trans_presets.java:1396 +#: build/trans_presets.java:551 build/trans_presets.java:584 +#: build/trans_presets.java:613 build/trans_presets.java:647 +#: build/trans_presets.java:672 build/trans_presets.java:696 +#: build/trans_presets.java:716 build/trans_presets.java:738 +#: build/trans_presets.java:1395 msgid "Cutting" msgstr "断开" @@ -19938,9 +19974,9 @@ #: build/trans_presets.java:371 build/trans_presets.java:407 #: build/trans_presets.java:428 build/trans_presets.java:487 -#: build/trans_presets.java:542 build/trans_presets.java:575 -#: build/trans_presets.java:604 build/trans_presets.java:638 -#: build/trans_presets.java:663 build/trans_presets.java:687 -#: build/trans_presets.java:707 build/trans_presets.java:729 -#: build/trans_presets.java:1397 +#: build/trans_presets.java:552 build/trans_presets.java:585 +#: build/trans_presets.java:614 build/trans_presets.java:648 +#: build/trans_presets.java:673 build/trans_presets.java:697 +#: build/trans_presets.java:717 build/trans_presets.java:739 +#: build/trans_presets.java:1396 msgid "Embankment" msgstr "堤防" @@ -19979,9 +20015,9 @@ #: build/trans_presets.java:372 build/trans_presets.java:392 #: build/trans_presets.java:408 build/trans_presets.java:429 -#: build/trans_presets.java:543 build/trans_presets.java:576 -#: build/trans_presets.java:605 build/trans_presets.java:639 -#: build/trans_presets.java:664 build/trans_presets.java:688 -#: build/trans_presets.java:708 build/trans_presets.java:730 -#: build/trans_presets.java:2352 +#: build/trans_presets.java:553 build/trans_presets.java:586 +#: build/trans_presets.java:615 build/trans_presets.java:649 +#: build/trans_presets.java:674 build/trans_presets.java:698 +#: build/trans_presets.java:718 build/trans_presets.java:740 +#: build/trans_presets.java:2353 msgid "Lit" msgstr "路灯" @@ -20067,4 +20103,5 @@ #. item "Highways/Streets/Bridge" combo "Incline" #. item "Highways/Streets/Tunnel" combo "Incline" +#. item "Highways/Streets/Ford" combo "Incline" #. item "Ways/Track" combo "Incline" #. item "Ways/Path" combo "Incline" @@ -20082,8 +20119,9 @@ #: build/trans_presets.java:435 build/trans_presets.java:491 #: build/trans_presets.java:508 build/trans_presets.java:523 -#: build/trans_presets.java:551 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:643 -#: build/trans_presets.java:667 build/trans_presets.java:692 -#: build/trans_presets.java:712 build/trans_presets.java:1402 +#: build/trans_presets.java:533 build/trans_presets.java:561 +#: build/trans_presets.java:598 build/trans_presets.java:619 +#: build/trans_presets.java:653 build/trans_presets.java:677 +#: build/trans_presets.java:702 build/trans_presets.java:722 +#: build/trans_presets.java:1401 msgid "Incline" msgstr "坡度" @@ -20103,4 +20141,5 @@ #. item "Highways/Streets/Bridge" combo "Incline" display value #. item "Highways/Streets/Tunnel" combo "Incline" display value +#. item "Highways/Streets/Ford" combo "Incline" display value #. item "Ways/Track" combo "Incline" display value #. item "Ways/Path" combo "Incline" display value @@ -20118,8 +20157,9 @@ #: build/trans_presets.java:435 build/trans_presets.java:491 #: build/trans_presets.java:508 build/trans_presets.java:523 -#: build/trans_presets.java:551 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:643 -#: build/trans_presets.java:667 build/trans_presets.java:692 -#: build/trans_presets.java:712 build/trans_presets.java:1402 +#: build/trans_presets.java:533 build/trans_presets.java:561 +#: build/trans_presets.java:598 build/trans_presets.java:619 +#: build/trans_presets.java:653 build/trans_presets.java:677 +#: build/trans_presets.java:702 build/trans_presets.java:722 +#: build/trans_presets.java:1401 msgid "10%" msgstr "10%" @@ -20139,4 +20179,5 @@ #. item "Highways/Streets/Bridge" combo "Incline" display value #. item "Highways/Streets/Tunnel" combo "Incline" display value +#. item "Highways/Streets/Ford" combo "Incline" display value #. item "Ways/Track" combo "Incline" display value #. item "Ways/Path" combo "Incline" display value @@ -20154,8 +20195,9 @@ #: build/trans_presets.java:435 build/trans_presets.java:491 #: build/trans_presets.java:508 build/trans_presets.java:523 -#: build/trans_presets.java:551 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:643 -#: build/trans_presets.java:667 build/trans_presets.java:692 -#: build/trans_presets.java:712 build/trans_presets.java:1402 +#: build/trans_presets.java:533 build/trans_presets.java:561 +#: build/trans_presets.java:598 build/trans_presets.java:619 +#: build/trans_presets.java:653 build/trans_presets.java:677 +#: build/trans_presets.java:702 build/trans_presets.java:722 +#: build/trans_presets.java:1401 msgid "-10%" msgstr "-10%" @@ -20175,4 +20217,5 @@ #. item "Highways/Streets/Bridge" combo "Incline" display value #. item "Highways/Streets/Tunnel" combo "Incline" display value +#. item "Highways/Streets/Ford" combo "Incline" display value #. item "Ways/Track" combo "Incline" display value #. item "Ways/Path" combo "Incline" display value @@ -20190,8 +20233,9 @@ #: build/trans_presets.java:435 build/trans_presets.java:491 #: build/trans_presets.java:508 build/trans_presets.java:523 -#: build/trans_presets.java:551 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:643 -#: build/trans_presets.java:667 build/trans_presets.java:692 -#: build/trans_presets.java:712 build/trans_presets.java:1402 +#: build/trans_presets.java:533 build/trans_presets.java:561 +#: build/trans_presets.java:598 build/trans_presets.java:619 +#: build/trans_presets.java:653 build/trans_presets.java:677 +#: build/trans_presets.java:702 build/trans_presets.java:722 +#: build/trans_presets.java:1401 msgid "10°" msgstr "-10%" @@ -20211,4 +20255,5 @@ #. item "Highways/Streets/Bridge" combo "Incline" display value #. item "Highways/Streets/Tunnel" combo "Incline" display value +#. item "Highways/Streets/Ford" combo "Incline" display value #. item "Ways/Track" combo "Incline" display value #. item "Ways/Path" combo "Incline" display value @@ -20226,8 +20271,9 @@ #: build/trans_presets.java:435 build/trans_presets.java:491 #: build/trans_presets.java:508 build/trans_presets.java:523 -#: build/trans_presets.java:551 build/trans_presets.java:588 -#: build/trans_presets.java:609 build/trans_presets.java:643 -#: build/trans_presets.java:667 build/trans_presets.java:692 -#: build/trans_presets.java:712 build/trans_presets.java:1402 +#: build/trans_presets.java:533 build/trans_presets.java:561 +#: build/trans_presets.java:598 build/trans_presets.java:619 +#: build/trans_presets.java:653 build/trans_presets.java:677 +#: build/trans_presets.java:702 build/trans_presets.java:722 +#: build/trans_presets.java:1401 msgid "-10°" msgstr "-10%" @@ -20300,5 +20346,5 @@ #. item "Ways/Dedicated Footway" check "Passing Places" #: build/trans_presets.java:288 build/trans_presets.java:373 -#: build/trans_presets.java:689 build/trans_presets.java:709 +#: build/trans_presets.java:699 build/trans_presets.java:719 msgid "Passing Places" msgstr "让车区" @@ -20330,10 +20376,10 @@ #: build/trans_presets.java:434 build/trans_presets.java:490 #: build/trans_presets.java:507 build/trans_presets.java:522 -#: build/trans_presets.java:550 build/trans_presets.java:587 -#: build/trans_presets.java:608 build/trans_presets.java:642 -#: build/trans_presets.java:666 build/trans_presets.java:691 -#: build/trans_presets.java:711 build/trans_presets.java:732 -#: build/trans_presets.java:1401 build/trans_presets.java:1799 -#: build/trans_presets.java:1844 +#: build/trans_presets.java:560 build/trans_presets.java:597 +#: build/trans_presets.java:618 build/trans_presets.java:652 +#: build/trans_presets.java:676 build/trans_presets.java:701 +#: build/trans_presets.java:721 build/trans_presets.java:742 +#: build/trans_presets.java:1400 build/trans_presets.java:1800 +#: build/trans_presets.java:1845 msgid "Width (meters)" msgstr "宽度 (米)" @@ -20375,9 +20421,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 msgid "Surface" msgstr "路面" @@ -20402,9 +20448,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 msgid "paved" msgstr "有铺面的" @@ -20428,9 +20474,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:1398 msgid "unpaved" msgstr "没铺面的" @@ -20454,9 +20500,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:1398 msgid "asphalt" msgstr "柏油" @@ -20481,9 +20527,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 msgid "concrete" msgstr "水泥地" @@ -20508,9 +20554,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 build/trans_presets.java:2707 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:1398 build/trans_presets.java:2708 msgid "metal" msgstr "金属" @@ -20530,4 +20576,5 @@ #. item "Ways/Dedicated Footway" combo "Surface" display value #. item "Ways/Steps" combo "Surface" display value +#. item "Barriers/Fence" combo "Type" display value #. item "Transport/Railway/Bus Guideway" combo "Surface" display value #. item "Leisure/Public Grill" combo "Fuel" display value @@ -20536,10 +20583,10 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 build/trans_presets.java:2397 -#: build/trans_presets.java:2707 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:955 build/trans_presets.java:1398 +#: build/trans_presets.java:2398 build/trans_presets.java:2708 msgid "wood" msgstr "木头" @@ -20563,9 +20610,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:1398 msgid "paving_stones" msgstr "铺路石" @@ -20590,9 +20637,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 msgid "cobblestone" msgstr "石子路" @@ -20617,9 +20664,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 msgid "gravel" msgstr "碎石路" @@ -20643,9 +20690,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:1398 msgid "pebblestone" msgstr "鹅卵石" @@ -20669,9 +20716,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:1398 msgid "compacted" msgstr "压实的" @@ -20695,9 +20742,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:570 -#: build/trans_presets.java:599 build/trans_presets.java:633 -#: build/trans_presets.java:658 build/trans_presets.java:682 -#: build/trans_presets.java:703 build/trans_presets.java:724 -#: build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:580 +#: build/trans_presets.java:609 build/trans_presets.java:643 +#: build/trans_presets.java:668 build/trans_presets.java:692 +#: build/trans_presets.java:713 build/trans_presets.java:734 +#: build/trans_presets.java:1398 msgid "grass_paver" msgstr "草地_铺面" @@ -20722,9 +20769,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 msgid "grass" msgstr "草地" @@ -20749,9 +20796,9 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 msgid "sand" msgstr "沙地" @@ -20777,10 +20824,10 @@ #: build/trans_presets.java:353 build/trans_presets.java:375 #: build/trans_presets.java:391 build/trans_presets.java:410 -#: build/trans_presets.java:431 build/trans_presets.java:537 -#: build/trans_presets.java:570 build/trans_presets.java:599 -#: build/trans_presets.java:633 build/trans_presets.java:658 -#: build/trans_presets.java:682 build/trans_presets.java:703 -#: build/trans_presets.java:724 build/trans_presets.java:1399 -#: build/trans_presets.java:2676 +#: build/trans_presets.java:431 build/trans_presets.java:547 +#: build/trans_presets.java:580 build/trans_presets.java:609 +#: build/trans_presets.java:643 build/trans_presets.java:668 +#: build/trans_presets.java:692 build/trans_presets.java:713 +#: build/trans_presets.java:734 build/trans_presets.java:1398 +#: build/trans_presets.java:2677 msgid "ground" msgstr "地面" @@ -20931,5 +20978,5 @@ #. #. color roundabout -#: build/trans_presets.java:432 build/trans_style.java:744 +#: build/trans_presets.java:432 build/trans_style.java:738 msgid "roundabout" msgstr "环岛" @@ -21083,64 +21130,64 @@ #: build/trans_presets.java:460 build/trans_presets.java:461 #: build/trans_presets.java:462 build/trans_presets.java:501 -#: build/trans_presets.java:546 build/trans_presets.java:547 -#: build/trans_presets.java:548 build/trans_presets.java:549 -#: build/trans_presets.java:578 build/trans_presets.java:579 -#: build/trans_presets.java:580 build/trans_presets.java:581 -#: build/trans_presets.java:582 build/trans_presets.java:583 -#: build/trans_presets.java:584 build/trans_presets.java:640 -#: build/trans_presets.java:808 build/trans_presets.java:1309 -#: build/trans_presets.java:1321 build/trans_presets.java:1333 -#: build/trans_presets.java:1345 build/trans_presets.java:1357 -#: build/trans_presets.java:1369 build/trans_presets.java:1381 -#: build/trans_presets.java:1593 build/trans_presets.java:1594 -#: build/trans_presets.java:1597 build/trans_presets.java:1598 -#: build/trans_presets.java:1599 build/trans_presets.java:1614 -#: build/trans_presets.java:1706 build/trans_presets.java:1718 -#: build/trans_presets.java:1719 build/trans_presets.java:1720 -#: build/trans_presets.java:1721 build/trans_presets.java:1722 -#: build/trans_presets.java:1833 build/trans_presets.java:1834 -#: build/trans_presets.java:1835 build/trans_presets.java:1953 -#: build/trans_presets.java:1954 build/trans_presets.java:1955 -#: build/trans_presets.java:1956 build/trans_presets.java:1971 -#: build/trans_presets.java:1972 build/trans_presets.java:1973 -#: build/trans_presets.java:1974 build/trans_presets.java:1987 -#: build/trans_presets.java:1988 build/trans_presets.java:1989 -#: build/trans_presets.java:1990 build/trans_presets.java:2004 -#: build/trans_presets.java:2005 build/trans_presets.java:2006 -#: build/trans_presets.java:2007 build/trans_presets.java:2022 -#: build/trans_presets.java:2023 build/trans_presets.java:2024 -#: build/trans_presets.java:2025 build/trans_presets.java:2039 -#: build/trans_presets.java:2040 build/trans_presets.java:2041 -#: build/trans_presets.java:2042 build/trans_presets.java:2056 -#: build/trans_presets.java:2057 build/trans_presets.java:2058 -#: build/trans_presets.java:2059 build/trans_presets.java:2062 -#: build/trans_presets.java:2078 build/trans_presets.java:2079 -#: build/trans_presets.java:2080 build/trans_presets.java:2081 -#: build/trans_presets.java:2101 build/trans_presets.java:2102 -#: build/trans_presets.java:2103 build/trans_presets.java:2104 -#: build/trans_presets.java:2120 build/trans_presets.java:2121 -#: build/trans_presets.java:2122 build/trans_presets.java:2123 -#: build/trans_presets.java:2137 build/trans_presets.java:2138 -#: build/trans_presets.java:2139 build/trans_presets.java:2140 -#: build/trans_presets.java:2156 build/trans_presets.java:2157 -#: build/trans_presets.java:2158 build/trans_presets.java:2159 -#: build/trans_presets.java:2175 build/trans_presets.java:2176 -#: build/trans_presets.java:2177 build/trans_presets.java:2178 -#: build/trans_presets.java:2191 build/trans_presets.java:2192 -#: build/trans_presets.java:2193 build/trans_presets.java:2194 -#: build/trans_presets.java:2208 build/trans_presets.java:2209 -#: build/trans_presets.java:2210 build/trans_presets.java:2211 -#: build/trans_presets.java:2225 build/trans_presets.java:2226 -#: build/trans_presets.java:2304 build/trans_presets.java:2314 -#: build/trans_presets.java:2375 build/trans_presets.java:2396 -#: build/trans_presets.java:2595 build/trans_presets.java:2647 -#: build/trans_presets.java:2648 build/trans_presets.java:2706 -#: build/trans_presets.java:2722 build/trans_presets.java:2723 -#: build/trans_presets.java:2724 build/trans_presets.java:3155 -#: build/trans_presets.java:3267 build/trans_presets.java:3268 -#: build/trans_presets.java:3269 build/trans_presets.java:3270 -#: build/trans_presets.java:3271 build/trans_presets.java:3272 -#: build/trans_presets.java:3273 build/trans_presets.java:3274 -#: build/trans_presets.java:3275 +#: build/trans_presets.java:556 build/trans_presets.java:557 +#: build/trans_presets.java:558 build/trans_presets.java:559 +#: build/trans_presets.java:588 build/trans_presets.java:589 +#: build/trans_presets.java:590 build/trans_presets.java:591 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 build/trans_presets.java:650 +#: build/trans_presets.java:818 build/trans_presets.java:1308 +#: build/trans_presets.java:1320 build/trans_presets.java:1332 +#: build/trans_presets.java:1344 build/trans_presets.java:1356 +#: build/trans_presets.java:1368 build/trans_presets.java:1380 +#: build/trans_presets.java:1592 build/trans_presets.java:1593 +#: build/trans_presets.java:1596 build/trans_presets.java:1597 +#: build/trans_presets.java:1598 build/trans_presets.java:1613 +#: build/trans_presets.java:1705 build/trans_presets.java:1717 +#: build/trans_presets.java:1718 build/trans_presets.java:1719 +#: build/trans_presets.java:1720 build/trans_presets.java:1721 +#: build/trans_presets.java:1834 build/trans_presets.java:1835 +#: build/trans_presets.java:1836 build/trans_presets.java:1954 +#: build/trans_presets.java:1955 build/trans_presets.java:1956 +#: build/trans_presets.java:1957 build/trans_presets.java:1972 +#: build/trans_presets.java:1973 build/trans_presets.java:1974 +#: build/trans_presets.java:1975 build/trans_presets.java:1988 +#: build/trans_presets.java:1989 build/trans_presets.java:1990 +#: build/trans_presets.java:1991 build/trans_presets.java:2005 +#: build/trans_presets.java:2006 build/trans_presets.java:2007 +#: build/trans_presets.java:2008 build/trans_presets.java:2023 +#: build/trans_presets.java:2024 build/trans_presets.java:2025 +#: build/trans_presets.java:2026 build/trans_presets.java:2040 +#: build/trans_presets.java:2041 build/trans_presets.java:2042 +#: build/trans_presets.java:2043 build/trans_presets.java:2057 +#: build/trans_presets.java:2058 build/trans_presets.java:2059 +#: build/trans_presets.java:2060 build/trans_presets.java:2063 +#: build/trans_presets.java:2079 build/trans_presets.java:2080 +#: build/trans_presets.java:2081 build/trans_presets.java:2082 +#: build/trans_presets.java:2102 build/trans_presets.java:2103 +#: build/trans_presets.java:2104 build/trans_presets.java:2105 +#: build/trans_presets.java:2121 build/trans_presets.java:2122 +#: build/trans_presets.java:2123 build/trans_presets.java:2124 +#: build/trans_presets.java:2138 build/trans_presets.java:2139 +#: build/trans_presets.java:2140 build/trans_presets.java:2141 +#: build/trans_presets.java:2157 build/trans_presets.java:2158 +#: build/trans_presets.java:2159 build/trans_presets.java:2160 +#: build/trans_presets.java:2176 build/trans_presets.java:2177 +#: build/trans_presets.java:2178 build/trans_presets.java:2179 +#: build/trans_presets.java:2192 build/trans_presets.java:2193 +#: build/trans_presets.java:2194 build/trans_presets.java:2195 +#: build/trans_presets.java:2209 build/trans_presets.java:2210 +#: build/trans_presets.java:2211 build/trans_presets.java:2212 +#: build/trans_presets.java:2226 build/trans_presets.java:2227 +#: build/trans_presets.java:2305 build/trans_presets.java:2315 +#: build/trans_presets.java:2376 build/trans_presets.java:2397 +#: build/trans_presets.java:2596 build/trans_presets.java:2648 +#: build/trans_presets.java:2649 build/trans_presets.java:2707 +#: build/trans_presets.java:2723 build/trans_presets.java:2724 +#: build/trans_presets.java:2725 build/trans_presets.java:3156 +#: build/trans_presets.java:3268 build/trans_presets.java:3269 +#: build/trans_presets.java:3270 build/trans_presets.java:3271 +#: build/trans_presets.java:3272 build/trans_presets.java:3273 +#: build/trans_presets.java:3274 build/trans_presets.java:3275 +#: build/trans_presets.java:3276 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:677 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:698 @@ -21216,8 +21263,8 @@ #: build/trans_presets.java:459 build/trans_presets.java:460 #: build/trans_presets.java:461 build/trans_presets.java:462 -#: build/trans_presets.java:546 build/trans_presets.java:547 -#: build/trans_presets.java:548 build/trans_presets.java:549 -#: build/trans_presets.java:578 build/trans_presets.java:579 -#: build/trans_presets.java:580 build/trans_presets.java:583 +#: build/trans_presets.java:556 build/trans_presets.java:557 +#: build/trans_presets.java:558 build/trans_presets.java:559 +#: build/trans_presets.java:588 build/trans_presets.java:589 +#: build/trans_presets.java:590 build/trans_presets.java:593 #: build/trans_style.java:179 msgid "destination" @@ -21247,8 +21294,8 @@ #: build/trans_presets.java:454 build/trans_presets.java:455 #: build/trans_presets.java:456 build/trans_presets.java:457 -#: build/trans_presets.java:546 build/trans_presets.java:547 -#: build/trans_presets.java:548 build/trans_presets.java:549 -#: build/trans_presets.java:578 build/trans_presets.java:579 -#: build/trans_presets.java:580 build/trans_presets.java:583 +#: build/trans_presets.java:556 build/trans_presets.java:557 +#: build/trans_presets.java:558 build/trans_presets.java:559 +#: build/trans_presets.java:588 build/trans_presets.java:589 +#: build/trans_presets.java:590 build/trans_presets.java:593 msgid "delivery" msgstr "送交" @@ -21298,9 +21345,9 @@ #: build/trans_presets.java:459 build/trans_presets.java:460 #: build/trans_presets.java:461 build/trans_presets.java:462 -#: build/trans_presets.java:546 build/trans_presets.java:547 -#: build/trans_presets.java:548 build/trans_presets.java:549 -#: build/trans_presets.java:578 build/trans_presets.java:579 -#: build/trans_presets.java:580 build/trans_presets.java:582 -#: build/trans_presets.java:583 build/trans_presets.java:2375 +#: build/trans_presets.java:556 build/trans_presets.java:557 +#: build/trans_presets.java:558 build/trans_presets.java:559 +#: build/trans_presets.java:588 build/trans_presets.java:589 +#: build/trans_presets.java:590 build/trans_presets.java:592 +#: build/trans_presets.java:593 build/trans_presets.java:2376 #: build/trans_style.java:169 msgid "permissive" @@ -21343,9 +21390,9 @@ #: build/trans_presets.java:459 build/trans_presets.java:460 #: build/trans_presets.java:461 build/trans_presets.java:462 -#: build/trans_presets.java:546 build/trans_presets.java:547 -#: build/trans_presets.java:548 build/trans_presets.java:549 -#: build/trans_presets.java:578 build/trans_presets.java:579 -#: build/trans_presets.java:580 build/trans_presets.java:582 -#: build/trans_presets.java:583 build/trans_presets.java:2375 +#: build/trans_presets.java:556 build/trans_presets.java:557 +#: build/trans_presets.java:558 build/trans_presets.java:559 +#: build/trans_presets.java:588 build/trans_presets.java:589 +#: build/trans_presets.java:590 build/trans_presets.java:592 +#: build/trans_presets.java:593 build/trans_presets.java:2376 #: build/trans_style.java:174 msgid "private" @@ -21366,7 +21413,7 @@ #: build/trans_presets.java:453 build/trans_presets.java:454 #: build/trans_presets.java:455 build/trans_presets.java:456 -#: build/trans_presets.java:457 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 +#: build/trans_presets.java:457 build/trans_presets.java:556 +#: build/trans_presets.java:557 build/trans_presets.java:558 +#: build/trans_presets.java:559 msgid "agricultural" msgstr "农业" @@ -21386,7 +21433,7 @@ #: build/trans_presets.java:453 build/trans_presets.java:454 #: build/trans_presets.java:455 build/trans_presets.java:456 -#: build/trans_presets.java:457 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 +#: build/trans_presets.java:457 build/trans_presets.java:556 +#: build/trans_presets.java:557 build/trans_presets.java:558 +#: build/trans_presets.java:559 msgid "forestry" msgstr "林业" @@ -21526,61 +21573,61 @@ #: build/trans_presets.java:459 build/trans_presets.java:460 #: build/trans_presets.java:461 build/trans_presets.java:462 -#: build/trans_presets.java:546 build/trans_presets.java:547 -#: build/trans_presets.java:548 build/trans_presets.java:549 -#: build/trans_presets.java:571 build/trans_presets.java:578 -#: build/trans_presets.java:579 build/trans_presets.java:580 -#: build/trans_presets.java:581 build/trans_presets.java:582 -#: build/trans_presets.java:583 build/trans_presets.java:584 -#: build/trans_presets.java:640 build/trans_presets.java:777 -#: build/trans_presets.java:799 build/trans_presets.java:1309 -#: build/trans_presets.java:1321 build/trans_presets.java:1333 -#: build/trans_presets.java:1345 build/trans_presets.java:1357 -#: build/trans_presets.java:1369 build/trans_presets.java:1381 -#: build/trans_presets.java:1424 build/trans_presets.java:1593 -#: build/trans_presets.java:1594 build/trans_presets.java:1597 -#: build/trans_presets.java:1598 build/trans_presets.java:1599 -#: build/trans_presets.java:1614 build/trans_presets.java:1706 -#: build/trans_presets.java:1718 build/trans_presets.java:1719 -#: build/trans_presets.java:1720 build/trans_presets.java:1721 -#: build/trans_presets.java:1722 build/trans_presets.java:1833 -#: build/trans_presets.java:1834 build/trans_presets.java:1835 -#: build/trans_presets.java:1953 build/trans_presets.java:1954 -#: build/trans_presets.java:1955 build/trans_presets.java:1956 -#: build/trans_presets.java:1971 build/trans_presets.java:1972 -#: build/trans_presets.java:1973 build/trans_presets.java:1974 -#: build/trans_presets.java:1987 build/trans_presets.java:1988 -#: build/trans_presets.java:1989 build/trans_presets.java:1990 -#: build/trans_presets.java:2004 build/trans_presets.java:2005 -#: build/trans_presets.java:2006 build/trans_presets.java:2007 -#: build/trans_presets.java:2022 build/trans_presets.java:2023 -#: build/trans_presets.java:2024 build/trans_presets.java:2025 -#: build/trans_presets.java:2039 build/trans_presets.java:2040 -#: build/trans_presets.java:2041 build/trans_presets.java:2042 -#: build/trans_presets.java:2056 build/trans_presets.java:2057 -#: build/trans_presets.java:2058 build/trans_presets.java:2059 -#: build/trans_presets.java:2062 build/trans_presets.java:2078 -#: build/trans_presets.java:2079 build/trans_presets.java:2080 -#: build/trans_presets.java:2081 build/trans_presets.java:2101 -#: build/trans_presets.java:2102 build/trans_presets.java:2103 -#: build/trans_presets.java:2104 build/trans_presets.java:2120 -#: build/trans_presets.java:2121 build/trans_presets.java:2122 -#: build/trans_presets.java:2123 build/trans_presets.java:2137 -#: build/trans_presets.java:2138 build/trans_presets.java:2139 -#: build/trans_presets.java:2140 build/trans_presets.java:2156 -#: build/trans_presets.java:2157 build/trans_presets.java:2158 -#: build/trans_presets.java:2159 build/trans_presets.java:2175 -#: build/trans_presets.java:2176 build/trans_presets.java:2177 -#: build/trans_presets.java:2178 build/trans_presets.java:2191 -#: build/trans_presets.java:2192 build/trans_presets.java:2193 -#: build/trans_presets.java:2194 build/trans_presets.java:2208 -#: build/trans_presets.java:2209 build/trans_presets.java:2210 -#: build/trans_presets.java:2211 build/trans_presets.java:2225 -#: build/trans_presets.java:2226 build/trans_presets.java:2304 -#: build/trans_presets.java:2314 build/trans_presets.java:2396 -#: build/trans_presets.java:2595 build/trans_presets.java:2647 -#: build/trans_presets.java:2648 build/trans_presets.java:2706 -#: build/trans_presets.java:2722 build/trans_presets.java:2723 -#: build/trans_presets.java:2724 build/trans_presets.java:3155 -#: build/trans_presets.java:3238 +#: build/trans_presets.java:556 build/trans_presets.java:557 +#: build/trans_presets.java:558 build/trans_presets.java:559 +#: build/trans_presets.java:581 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:590 +#: build/trans_presets.java:591 build/trans_presets.java:592 +#: build/trans_presets.java:593 build/trans_presets.java:594 +#: build/trans_presets.java:650 build/trans_presets.java:787 +#: build/trans_presets.java:809 build/trans_presets.java:1308 +#: build/trans_presets.java:1320 build/trans_presets.java:1332 +#: build/trans_presets.java:1344 build/trans_presets.java:1356 +#: build/trans_presets.java:1368 build/trans_presets.java:1380 +#: build/trans_presets.java:1423 build/trans_presets.java:1592 +#: build/trans_presets.java:1593 build/trans_presets.java:1596 +#: build/trans_presets.java:1597 build/trans_presets.java:1598 +#: build/trans_presets.java:1613 build/trans_presets.java:1705 +#: build/trans_presets.java:1717 build/trans_presets.java:1718 +#: build/trans_presets.java:1719 build/trans_presets.java:1720 +#: build/trans_presets.java:1721 build/trans_presets.java:1834 +#: build/trans_presets.java:1835 build/trans_presets.java:1836 +#: build/trans_presets.java:1954 build/trans_presets.java:1955 +#: build/trans_presets.java:1956 build/trans_presets.java:1957 +#: build/trans_presets.java:1972 build/trans_presets.java:1973 +#: build/trans_presets.java:1974 build/trans_presets.java:1975 +#: build/trans_presets.java:1988 build/trans_presets.java:1989 +#: build/trans_presets.java:1990 build/trans_presets.java:1991 +#: build/trans_presets.java:2005 build/trans_presets.java:2006 +#: build/trans_presets.java:2007 build/trans_presets.java:2008 +#: build/trans_presets.java:2023 build/trans_presets.java:2024 +#: build/trans_presets.java:2025 build/trans_presets.java:2026 +#: build/trans_presets.java:2040 build/trans_presets.java:2041 +#: build/trans_presets.java:2042 build/trans_presets.java:2043 +#: build/trans_presets.java:2057 build/trans_presets.java:2058 +#: build/trans_presets.java:2059 build/trans_presets.java:2060 +#: build/trans_presets.java:2063 build/trans_presets.java:2079 +#: build/trans_presets.java:2080 build/trans_presets.java:2081 +#: build/trans_presets.java:2082 build/trans_presets.java:2102 +#: build/trans_presets.java:2103 build/trans_presets.java:2104 +#: build/trans_presets.java:2105 build/trans_presets.java:2121 +#: build/trans_presets.java:2122 build/trans_presets.java:2123 +#: build/trans_presets.java:2124 build/trans_presets.java:2138 +#: build/trans_presets.java:2139 build/trans_presets.java:2140 +#: build/trans_presets.java:2141 build/trans_presets.java:2157 +#: build/trans_presets.java:2158 build/trans_presets.java:2159 +#: build/trans_presets.java:2160 build/trans_presets.java:2176 +#: build/trans_presets.java:2177 build/trans_presets.java:2178 +#: build/trans_presets.java:2179 build/trans_presets.java:2192 +#: build/trans_presets.java:2193 build/trans_presets.java:2194 +#: build/trans_presets.java:2195 build/trans_presets.java:2209 +#: build/trans_presets.java:2210 build/trans_presets.java:2211 +#: build/trans_presets.java:2212 build/trans_presets.java:2226 +#: build/trans_presets.java:2227 build/trans_presets.java:2305 +#: build/trans_presets.java:2315 build/trans_presets.java:2397 +#: build/trans_presets.java:2596 build/trans_presets.java:2648 +#: build/trans_presets.java:2649 build/trans_presets.java:2707 +#: build/trans_presets.java:2723 build/trans_presets.java:2724 +#: build/trans_presets.java:2725 build/trans_presets.java:3156 +#: build/trans_presets.java:3239 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:678 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:699 @@ -21614,10 +21661,10 @@ #: build/trans_presets.java:457 build/trans_presets.java:459 #: build/trans_presets.java:460 build/trans_presets.java:461 -#: build/trans_presets.java:462 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:578 -#: build/trans_presets.java:579 build/trans_presets.java:580 -#: build/trans_presets.java:581 build/trans_presets.java:582 -#: build/trans_presets.java:583 +#: build/trans_presets.java:462 build/trans_presets.java:556 +#: build/trans_presets.java:557 build/trans_presets.java:558 +#: build/trans_presets.java:559 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:590 +#: build/trans_presets.java:591 build/trans_presets.java:592 +#: build/trans_presets.java:593 msgid "official" msgstr "官方" @@ -21649,10 +21696,10 @@ #: build/trans_presets.java:457 build/trans_presets.java:459 #: build/trans_presets.java:460 build/trans_presets.java:461 -#: build/trans_presets.java:462 build/trans_presets.java:546 -#: build/trans_presets.java:547 build/trans_presets.java:548 -#: build/trans_presets.java:549 build/trans_presets.java:578 -#: build/trans_presets.java:579 build/trans_presets.java:580 -#: build/trans_presets.java:582 build/trans_presets.java:583 -#: build/trans_presets.java:584 +#: build/trans_presets.java:462 build/trans_presets.java:556 +#: build/trans_presets.java:557 build/trans_presets.java:558 +#: build/trans_presets.java:559 build/trans_presets.java:588 +#: build/trans_presets.java:589 build/trans_presets.java:590 +#: build/trans_presets.java:592 build/trans_presets.java:593 +#: build/trans_presets.java:594 msgid "designated" msgstr "指定" @@ -21671,11 +21718,11 @@ #. item "Barriers/Bump Gate" check "Horse" #. item "Barriers/Sally Port" check "Horse" -#: build/trans_presets.java:449 build/trans_presets.java:580 -#: build/trans_presets.java:871 build/trans_presets.java:881 -#: build/trans_presets.java:890 build/trans_presets.java:916 -#: build/trans_presets.java:938 build/trans_presets.java:981 -#: build/trans_presets.java:994 build/trans_presets.java:1006 -#: build/trans_presets.java:1018 build/trans_presets.java:1030 -#: build/trans_presets.java:1070 +#: build/trans_presets.java:449 build/trans_presets.java:590 +#: build/trans_presets.java:873 build/trans_presets.java:883 +#: build/trans_presets.java:892 build/trans_presets.java:918 +#: build/trans_presets.java:940 build/trans_presets.java:980 +#: build/trans_presets.java:993 build/trans_presets.java:1005 +#: build/trans_presets.java:1017 build/trans_presets.java:1029 +#: build/trans_presets.java:1069 msgid "Horse" msgstr "马" @@ -21693,5 +21740,5 @@ #. item "Highways/Streets/Road Restrictions" combo "Motor vehicles" #. item "Ways/Track" combo "Motor vehicles" -#: build/trans_presets.java:453 build/trans_presets.java:547 +#: build/trans_presets.java:453 build/trans_presets.java:557 msgid "Motor vehicles" msgstr "机动车" @@ -21712,12 +21759,12 @@ #. item "Barriers/Sally Port" check "Motorcycle" #. group "Motorcycle" -#: build/trans_presets.java:454 build/trans_presets.java:548 -#: build/trans_presets.java:872 build/trans_presets.java:882 -#: build/trans_presets.java:891 build/trans_presets.java:902 -#: build/trans_presets.java:917 build/trans_presets.java:939 -#: build/trans_presets.java:982 build/trans_presets.java:995 -#: build/trans_presets.java:1007 build/trans_presets.java:1019 -#: build/trans_presets.java:1031 build/trans_presets.java:1071 -#: build/trans_presets.java:1699 +#: build/trans_presets.java:454 build/trans_presets.java:558 +#: build/trans_presets.java:874 build/trans_presets.java:884 +#: build/trans_presets.java:893 build/trans_presets.java:904 +#: build/trans_presets.java:919 build/trans_presets.java:941 +#: build/trans_presets.java:981 build/trans_presets.java:994 +#: build/trans_presets.java:1006 build/trans_presets.java:1018 +#: build/trans_presets.java:1030 build/trans_presets.java:1070 +#: build/trans_presets.java:1698 msgid "Motorcycle" msgstr "摩托车" @@ -21735,10 +21782,10 @@ #. item "Barriers/Bump Gate" check "Motorcar" #. item "Barriers/Sally Port" check "Motorcar" -#: build/trans_presets.java:455 build/trans_presets.java:549 -#: build/trans_presets.java:584 build/trans_presets.java:903 -#: build/trans_presets.java:918 build/trans_presets.java:940 -#: build/trans_presets.java:983 build/trans_presets.java:996 -#: build/trans_presets.java:1008 build/trans_presets.java:1020 -#: build/trans_presets.java:1032 build/trans_presets.java:1072 +#: build/trans_presets.java:455 build/trans_presets.java:559 +#: build/trans_presets.java:594 build/trans_presets.java:905 +#: build/trans_presets.java:920 build/trans_presets.java:942 +#: build/trans_presets.java:982 build/trans_presets.java:995 +#: build/trans_presets.java:1007 build/trans_presets.java:1019 +#: build/trans_presets.java:1031 build/trans_presets.java:1071 msgid "Motorcar" msgstr "汽车" @@ -21838,6 +21885,6 @@ #. #. color motorway -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:417 build/trans_style.java:423 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:411 build/trans_style.java:417 msgid "motorway" msgstr "高速公路" @@ -21845,5 +21892,5 @@ #. item "Highways/Streets/Roundabout" combo "Type" display value #. item "Ways/Cycle Lane" combo "Highway" display value -#: build/trans_presets.java:480 build/trans_presets.java:621 +#: build/trans_presets.java:480 build/trans_presets.java:631 msgid "motorway_link" msgstr "高速公路连络线" @@ -21863,6 +21910,6 @@ #. #. color trunk -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:429 build/trans_style.java:435 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:423 build/trans_style.java:429 msgid "trunk" msgstr "快速道路" @@ -21870,5 +21917,5 @@ #. item "Highways/Streets/Roundabout" combo "Type" display value #. item "Ways/Cycle Lane" combo "Highway" display value -#: build/trans_presets.java:480 build/trans_presets.java:621 +#: build/trans_presets.java:480 build/trans_presets.java:631 msgid "trunk_link" msgstr "快速道路连络线" @@ -21888,6 +21935,6 @@ #. #. color primary -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:441 build/trans_style.java:447 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:435 build/trans_style.java:441 msgid "primary" msgstr "一级道路" @@ -21895,5 +21942,5 @@ #. item "Highways/Streets/Roundabout" combo "Type" display value #. item "Ways/Cycle Lane" combo "Highway" display value -#: build/trans_presets.java:480 build/trans_presets.java:621 +#: build/trans_presets.java:480 build/trans_presets.java:631 msgid "primary_link" msgstr "一级道路连络线" @@ -21913,6 +21960,6 @@ #. #. color secondary -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:453 build/trans_style.java:459 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:447 build/trans_style.java:453 msgid "secondary" msgstr "二级道路" @@ -21932,6 +21979,6 @@ #. #. color tertiary -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:465 build/trans_style.java:471 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:459 build/trans_style.java:465 msgid "tertiary" msgstr "三级道路" @@ -21939,5 +21986,5 @@ #. item "Highways/Streets/Roundabout" combo "Type" display value #. item "Ways/Cycle Lane" combo "Highway" display value -#: build/trans_presets.java:480 build/trans_presets.java:621 +#: build/trans_presets.java:480 build/trans_presets.java:631 msgid "unclassified" msgstr "未分类道路" @@ -21951,6 +21998,6 @@ #. #. color residential -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:2748 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:2763 msgid "residential" msgstr "居住区道路" @@ -21958,5 +22005,5 @@ #. item "Highways/Streets/Roundabout" combo "Type" display value #. item "Ways/Cycle Lane" combo "Highway" display value -#: build/trans_presets.java:480 build/trans_presets.java:621 +#: build/trans_presets.java:480 build/trans_presets.java:631 msgid "living_street" msgstr "生活街道" @@ -21997,6 +22044,6 @@ #. #. color service -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:513 build/trans_style.java:3662 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:507 build/trans_style.java:3677 msgid "service" msgstr "服务道路" @@ -22004,5 +22051,5 @@ #. item "Highways/Streets/Roundabout" combo "Type" display value #. item "Ways/Cycle Lane" combo "Highway" display value -#: build/trans_presets.java:480 build/trans_presets.java:621 +#: build/trans_presets.java:480 build/trans_presets.java:631 msgid "bus_guideway" msgstr "有轨电车专用道" @@ -22027,7 +22074,7 @@ #. #. color construction -#: build/trans_presets.java:480 build/trans_presets.java:621 -#: build/trans_style.java:698 build/trans_style.java:2803 -#: build/trans_style.java:2804 +#: build/trans_presets.java:480 build/trans_presets.java:631 +#: build/trans_style.java:692 build/trans_style.java:2818 +#: build/trans_style.java:2819 msgid "construction" msgstr "施工" @@ -22063,11 +22110,22 @@ #. +#. item "Highways/Streets/Ford" +#: build/trans_presets.java:526 +msgid "Ford" +msgstr "浅滩" + +#. item "Highways/Streets/Ford" label "Edit Ford" +#: build/trans_presets.java:527 +msgid "Edit Ford" +msgstr "编辑浅滩" + +#. #. group "Ways" -#: build/trans_presets.java:527 +#: build/trans_presets.java:537 msgid "Ways" msgstr "路径" #. item "Ways/Track" -#: build/trans_presets.java:528 +#: build/trans_presets.java:538 msgid "Track" msgstr "路辙" @@ -22076,35 +22134,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" /> #. item "Ways/Track" label "Edit Track" -#: build/trans_presets.java:531 +#: build/trans_presets.java:541 msgid "Edit Track" msgstr "编辑路辙" #. item "Ways/Track" combo "Tracktype" -#: build/trans_presets.java:536 +#: build/trans_presets.java:546 msgid "Tracktype" msgstr "路辙类型" #. item "Ways/Track" combo "Tracktype" display value -#: build/trans_presets.java:536 +#: build/trans_presets.java:546 msgid "grade1" msgstr "第一级" #. item "Ways/Track" combo "Tracktype" display value -#: build/trans_presets.java:536 +#: build/trans_presets.java:546 msgid "grade2" msgstr "第二级" #. item "Ways/Track" combo "Tracktype" display value -#: build/trans_presets.java:536 +#: build/trans_presets.java:546 msgid "grade3" msgstr "第三级" #. item "Ways/Track" combo "Tracktype" display value -#: build/trans_presets.java:536 +#: build/trans_presets.java:546 msgid "grade4" msgstr "第四级" #. item "Ways/Track" combo "Tracktype" display value -#: build/trans_presets.java:536 +#: build/trans_presets.java:546 msgid "grade5" msgstr "第五级" @@ -22112,10 +22170,10 @@ #. item "Ways/Track" combo "MTB Scale" #. item "Ways/Path" combo "MTB Scale" -#: build/trans_presets.java:538 build/trans_presets.java:569 +#: build/trans_presets.java:548 build/trans_presets.java:579 msgid "MTB Scale" msgstr "MTB 比例" #. item "Ways/Track" combo "General access" -#: build/trans_presets.java:546 +#: build/trans_presets.java:556 msgid "General access" msgstr "常规" @@ -22123,5 +22181,5 @@ #. #. item "Ways/Path" -#: build/trans_presets.java:554 +#: build/trans_presets.java:564 msgid "Path" msgstr "小径" @@ -22130,50 +22188,50 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" /> #. item "Ways/Path" label "Edit Path" -#: build/trans_presets.java:557 +#: build/trans_presets.java:567 msgid "Edit Path" msgstr "编辑小径" #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:562 +#: build/trans_presets.java:572 msgid "SAC Scale" msgstr "SAC 比例" #. item "Ways/Path" combo "SAC Scale" display value -#: build/trans_presets.java:562 +#: build/trans_presets.java:572 msgid "T1 - hiking trail" msgstr "T1 - 步道" #. item "Ways/Path" combo "SAC Scale" display value -#: build/trans_presets.java:562 +#: build/trans_presets.java:572 msgid "T2 - mountain hiking trail" msgstr "T2 - 登山步道" #. item "Ways/Path" combo "SAC Scale" display value -#: build/trans_presets.java:562 +#: build/trans_presets.java:572 msgid "T3 - difficult, exposed hiking trail" msgstr "T3 - 艰难，裸露步道" #. item "Ways/Path" combo "SAC Scale" display value -#: build/trans_presets.java:562 +#: build/trans_presets.java:572 msgid "T4 - difficult, exposed, steep alpine trail" msgstr "T4 - 艰难，裸露，陡峭的高山步道" #. item "Ways/Path" combo "SAC Scale" display value -#: build/trans_presets.java:562 +#: build/trans_presets.java:572 msgid "T5 - difficult alpine trail with climbing" msgstr "T5 - 艰难的攀登高山步道" #. item "Ways/Path" combo "SAC Scale" display value -#: build/trans_presets.java:562 +#: build/trans_presets.java:572 msgid "T6 - hazardous alpine trail with climbing" msgstr "T6 - 危险的攀登高山步道" #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description -#: build/trans_presets.java:563 +#: build/trans_presets.java:573 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard" msgstr "步道清理的很好。地面平坦或略有倾斜，没有摔伤的危险" #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description -#: build/trans_presets.java:564 +#: build/trans_presets.java:574 msgid "" "Trail with continuous line and balanced ascent. Terrain partially steep, " @@ -22182,5 +22240,5 @@ #. item "Ways/Path" combo "SAC Scale" item "T3 - difficult, exposed hiking trail" short description -#: build/trans_presets.java:565 +#: build/trans_presets.java:575 msgid "" "exposed sites may be secured with ropes or chains, possible need to use " @@ -22190,5 +22248,5 @@ #. item "Ways/Path" combo "SAC Scale" item "T4 - difficult, exposed, steep alpine trail" short description -#: build/trans_presets.java:566 +#: build/trans_presets.java:576 msgid "" "sometimes need for hand use to get ahead. Terrain quite exposed, precarious " @@ -22197,5 +22255,5 @@ #. item "Ways/Path" combo "SAC Scale" item "T5 - difficult alpine trail with climbing" short description -#: build/trans_presets.java:567 +#: build/trans_presets.java:577 msgid "" "single plainly climbing up to second grade. Exposed, demanding terrain, " @@ -22204,5 +22262,5 @@ #. item "Ways/Path" combo "SAC Scale" item "T6 - hazardous alpine trail with climbing" short description -#: build/trans_presets.java:568 +#: build/trans_presets.java:578 msgid "" "climbing up to second grade. Often very exposed, precarious jagged rocks, " @@ -22212,5 +22270,5 @@ #. item "Ways/Path" combo "Visibility" #. visibilty -#: build/trans_presets.java:571 +#: build/trans_presets.java:581 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:125 msgid "Visibility" @@ -22218,10 +22276,10 @@ #. item "Ways/Path" combo "Visibility" display value -#: build/trans_presets.java:571 +#: build/trans_presets.java:581 msgid "excellent" msgstr "极好" #. item "Ways/Path" combo "Visibility" display value -#: build/trans_presets.java:571 +#: build/trans_presets.java:581 msgid "good" msgstr "良好" @@ -22229,15 +22287,15 @@ #. item "Ways/Path" combo "Visibility" display value #. item "Sport/Skiing" combo "Difficulty" display value -#: build/trans_presets.java:571 build/trans_presets.java:2894 +#: build/trans_presets.java:581 build/trans_presets.java:2895 msgid "intermediate" msgstr "中等" #. item "Ways/Path" combo "Visibility" display value -#: build/trans_presets.java:571 +#: build/trans_presets.java:581 msgid "bad" msgstr "较差" #. item "Ways/Path" combo "Visibility" display value -#: build/trans_presets.java:571 +#: build/trans_presets.java:581 msgid "horrible" msgstr "可怕" @@ -22260,23 +22318,23 @@ #. item "Food+Drinks/Bar" combo "Wheelchairs" #. item "Food+Drinks/Nightclub" combo "Wheelchairs" -#: build/trans_presets.java:581 build/trans_presets.java:1956 -#: build/trans_presets.java:1974 build/trans_presets.java:1990 -#: build/trans_presets.java:2007 build/trans_presets.java:2025 -#: build/trans_presets.java:2042 build/trans_presets.java:2059 -#: build/trans_presets.java:2081 build/trans_presets.java:2104 -#: build/trans_presets.java:2123 build/trans_presets.java:2140 -#: build/trans_presets.java:2159 build/trans_presets.java:2178 -#: build/trans_presets.java:2194 build/trans_presets.java:2211 -#: build/trans_presets.java:2226 +#: build/trans_presets.java:591 build/trans_presets.java:1957 +#: build/trans_presets.java:1975 build/trans_presets.java:1991 +#: build/trans_presets.java:2008 build/trans_presets.java:2026 +#: build/trans_presets.java:2043 build/trans_presets.java:2060 +#: build/trans_presets.java:2082 build/trans_presets.java:2105 +#: build/trans_presets.java:2124 build/trans_presets.java:2141 +#: build/trans_presets.java:2160 build/trans_presets.java:2179 +#: build/trans_presets.java:2195 build/trans_presets.java:2212 +#: build/trans_presets.java:2227 msgid "Wheelchairs" msgstr "轮椅" #. item "Ways/Path" combo "Ski" -#: build/trans_presets.java:582 +#: build/trans_presets.java:592 msgid "Ski" msgstr "滑雪" #. item "Ways/Path" combo "Snowmobile" -#: build/trans_presets.java:583 +#: build/trans_presets.java:593 msgid "Snowmobile" msgstr "雪上摩托车" @@ -22285,5 +22343,5 @@ #. #. item "Ways/Dedicated Bridleway" -#: build/trans_presets.java:592 +#: build/trans_presets.java:602 msgid "Dedicated Bridleway" msgstr "专用马道" @@ -22291,5 +22349,5 @@ #. #. item "Ways/Dedicated Bridleway" label "Edit Bridleway" -#: build/trans_presets.java:594 +#: build/trans_presets.java:604 msgid "Edit Bridleway" msgstr "编辑马道" @@ -22297,5 +22355,5 @@ #. #. item "Ways/Cycle Lane" -#: build/trans_presets.java:612 +#: build/trans_presets.java:622 msgid "Cycle Lane" msgstr "" @@ -22303,10 +22361,10 @@ #. #. item "Ways/Cycle Lane" label "Edit Cycle Lane" -#: build/trans_presets.java:614 +#: build/trans_presets.java:624 msgid "Edit Cycle Lane" msgstr "" #. item "Ways/Cycle Lane" combo "Cycleway" -#: build/trans_presets.java:615 +#: build/trans_presets.java:625 msgid "Cycleway" msgstr "" @@ -22315,6 +22373,6 @@ #. item "Ways/Cycle Lane" combo "Cycleway left" display value #. item "Ways/Cycle Lane" combo "Cycleway right" display value -#: build/trans_presets.java:615 build/trans_presets.java:616 -#: build/trans_presets.java:617 +#: build/trans_presets.java:625 build/trans_presets.java:626 +#: build/trans_presets.java:627 msgid "lane" msgstr "" @@ -22365,27 +22423,27 @@ #. item "Motorsport/Model Aerodrome" combo "type" display value #. item "Motorsport/RC Car" combo "type" display value -#: build/trans_presets.java:615 build/trans_presets.java:616 -#: build/trans_presets.java:617 build/trans_presets.java:2808 -#: build/trans_presets.java:2814 build/trans_presets.java:2820 -#: build/trans_presets.java:2826 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2862 build/trans_presets.java:2868 -#: build/trans_presets.java:2874 build/trans_presets.java:2880 -#: build/trans_presets.java:2886 build/trans_presets.java:2895 -#: build/trans_presets.java:2902 build/trans_presets.java:2910 -#: build/trans_presets.java:2916 build/trans_presets.java:2922 -#: build/trans_presets.java:2928 build/trans_presets.java:2934 -#: build/trans_presets.java:2940 build/trans_presets.java:2946 -#: build/trans_presets.java:2952 build/trans_presets.java:2958 -#: build/trans_presets.java:2982 build/trans_presets.java:2988 -#: build/trans_presets.java:2994 build/trans_presets.java:3000 -#: build/trans_presets.java:3006 build/trans_presets.java:3012 -#: build/trans_presets.java:3018 build/trans_presets.java:3024 -#: build/trans_presets.java:3030 build/trans_presets.java:3036 -#: build/trans_presets.java:3042 build/trans_presets.java:3050 -#: build/trans_presets.java:3056 build/trans_presets.java:3062 -#: build/trans_presets.java:3068 build/trans_presets.java:3075 -#: build/trans_presets.java:3081 +#: build/trans_presets.java:625 build/trans_presets.java:626 +#: build/trans_presets.java:627 build/trans_presets.java:2809 +#: build/trans_presets.java:2815 build/trans_presets.java:2821 +#: build/trans_presets.java:2827 build/trans_presets.java:2833 +#: build/trans_presets.java:2839 build/trans_presets.java:2845 +#: build/trans_presets.java:2851 build/trans_presets.java:2857 +#: build/trans_presets.java:2863 build/trans_presets.java:2869 +#: build/trans_presets.java:2875 build/trans_presets.java:2881 +#: build/trans_presets.java:2887 build/trans_presets.java:2896 +#: build/trans_presets.java:2903 build/trans_presets.java:2911 +#: build/trans_presets.java:2917 build/trans_presets.java:2923 +#: build/trans_presets.java:2929 build/trans_presets.java:2935 +#: build/trans_presets.java:2941 build/trans_presets.java:2947 +#: build/trans_presets.java:2953 build/trans_presets.java:2959 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2995 build/trans_presets.java:3001 +#: build/trans_presets.java:3007 build/trans_presets.java:3013 +#: build/trans_presets.java:3019 build/trans_presets.java:3025 +#: build/trans_presets.java:3031 build/trans_presets.java:3037 +#: build/trans_presets.java:3043 build/trans_presets.java:3051 +#: build/trans_presets.java:3057 build/trans_presets.java:3063 +#: build/trans_presets.java:3069 build/trans_presets.java:3076 +#: build/trans_presets.java:3082 msgid "track" msgstr "轨迹" @@ -22394,6 +22452,6 @@ #. item "Ways/Cycle Lane" combo "Cycleway left" display value #. item "Ways/Cycle Lane" combo "Cycleway right" display value -#: build/trans_presets.java:615 build/trans_presets.java:616 -#: build/trans_presets.java:617 +#: build/trans_presets.java:625 build/trans_presets.java:626 +#: build/trans_presets.java:627 msgid "opposite_lane" msgstr "" @@ -22402,6 +22460,6 @@ #. item "Ways/Cycle Lane" combo "Cycleway left" display value #. item "Ways/Cycle Lane" combo "Cycleway right" display value -#: build/trans_presets.java:615 build/trans_presets.java:616 -#: build/trans_presets.java:617 +#: build/trans_presets.java:625 build/trans_presets.java:626 +#: build/trans_presets.java:627 msgid "opposite_track" msgstr "" @@ -22410,6 +22468,6 @@ #. item "Ways/Cycle Lane" combo "Cycleway left" display value #. item "Ways/Cycle Lane" combo "Cycleway right" display value -#: build/trans_presets.java:615 build/trans_presets.java:616 -#: build/trans_presets.java:617 +#: build/trans_presets.java:625 build/trans_presets.java:626 +#: build/trans_presets.java:627 msgid "opposite" msgstr "" @@ -22418,6 +22476,6 @@ #. item "Ways/Cycle Lane" combo "Cycleway left" display value #. item "Ways/Cycle Lane" combo "Cycleway right" display value -#: build/trans_presets.java:615 build/trans_presets.java:616 -#: build/trans_presets.java:617 +#: build/trans_presets.java:625 build/trans_presets.java:626 +#: build/trans_presets.java:627 msgid "share_busway" msgstr "" @@ -22426,21 +22484,21 @@ #. item "Ways/Cycle Lane" combo "Cycleway left" display value #. item "Ways/Cycle Lane" combo "Cycleway right" display value -#: build/trans_presets.java:615 build/trans_presets.java:616 -#: build/trans_presets.java:617 +#: build/trans_presets.java:625 build/trans_presets.java:626 +#: build/trans_presets.java:627 msgid "shared_lane" msgstr "" #. item "Ways/Cycle Lane" combo "Cycleway left" -#: build/trans_presets.java:616 +#: build/trans_presets.java:626 msgid "Cycleway left" msgstr "" #. item "Ways/Cycle Lane" combo "Cycleway right" -#: build/trans_presets.java:617 +#: build/trans_presets.java:627 msgid "Cycleway right" msgstr "" #. item "Ways/Cycle Lane" check "Oneway (bicycle)" -#: build/trans_presets.java:618 +#: build/trans_presets.java:628 msgid "Oneway (bicycle)" msgstr "" @@ -22448,15 +22506,15 @@ #. #. item "Ways/Cycle Lane" label "Edit Highway" -#: build/trans_presets.java:620 +#: build/trans_presets.java:630 msgid "Edit Highway" msgstr "" #. item "Ways/Cycle Lane" combo "Highway" -#: build/trans_presets.java:621 +#: build/trans_presets.java:631 msgid "Highway" msgstr "" #. item "Ways/Dedicated Cycleway" -#: build/trans_presets.java:624 +#: build/trans_presets.java:634 msgid "Dedicated Cycleway" msgstr "专用自行车道" @@ -22474,11 +22532,11 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" /> #. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway" -#: build/trans_presets.java:628 build/trans_presets.java:650 -#: build/trans_presets.java:674 +#: build/trans_presets.java:638 build/trans_presets.java:660 +#: build/trans_presets.java:684 msgid "Edit Cycleway" msgstr "编辑自行车道" #. item "Ways/Dedicated Cycleway" combo "Pedestrians" -#: build/trans_presets.java:640 +#: build/trans_presets.java:650 msgid "Pedestrians" msgstr "行人" @@ -22486,5 +22544,5 @@ #. #. item "Ways/Segregated Foot- and Cycleway" -#: build/trans_presets.java:646 +#: build/trans_presets.java:656 msgid "Segregated Foot- and Cycleway" msgstr "分离的步行与自行车道" @@ -22492,5 +22550,5 @@ #. #. item "Ways/Combined Foot- and Cycleway" -#: build/trans_presets.java:670 +#: build/trans_presets.java:680 msgid "Combined Foot- and Cycleway" msgstr "合并的步行与自行车道" @@ -22498,5 +22556,5 @@ #. #. item "Ways/Dedicated Footway" -#: build/trans_presets.java:695 +#: build/trans_presets.java:705 msgid "Dedicated Footway" msgstr "专用人行步道" @@ -22505,5 +22563,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" /> #. item "Ways/Dedicated Footway" label "Edit Footway" -#: build/trans_presets.java:698 +#: build/trans_presets.java:708 msgid "Edit Footway" msgstr "编辑人行步道" @@ -22511,5 +22569,5 @@ #. #. item "Ways/Steps" -#: build/trans_presets.java:715 +#: build/trans_presets.java:725 msgid "Steps" msgstr "楼梯" @@ -22519,10 +22577,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" /> #. item "Ways/Steps" label "Edit Flight of Steps" -#: build/trans_presets.java:719 +#: build/trans_presets.java:729 msgid "Edit Flight of Steps" msgstr "编辑楼梯" #. item "Ways/Steps" text "Amount of Steps" -#: build/trans_presets.java:733 +#: build/trans_presets.java:743 msgid "Amount of Steps" msgstr "阶梯数" @@ -22530,5 +22588,5 @@ #. #. group "Waypoints" -#: build/trans_presets.java:737 +#: build/trans_presets.java:747 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:91 msgid "Waypoints" @@ -22536,5 +22594,5 @@ #. item "Waypoints/Motorway Junction" -#: build/trans_presets.java:738 +#: build/trans_presets.java:748 msgid "Motorway Junction" msgstr "高速公路出口" @@ -22542,10 +22600,10 @@ #. #. item "Waypoints/Motorway Junction" label "Edit Motorway Junction" -#: build/trans_presets.java:740 +#: build/trans_presets.java:750 msgid "Edit Motorway Junction" msgstr "编辑高速公路出口" #. item "Waypoints/Motorway Junction" text "Number" -#: build/trans_presets.java:744 +#: build/trans_presets.java:754 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesTableModel.java:32 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/UnresolvedAddressesTableModel.java:50 @@ -22554,10 +22612,10 @@ #. item "Waypoints/Motorway Junction" text "Exit to" -#: build/trans_presets.java:745 +#: build/trans_presets.java:755 msgid "Exit to" msgstr "至" #. item "Waypoints/Services" -#: build/trans_presets.java:747 +#: build/trans_presets.java:757 msgid "Services" msgstr "服务站" @@ -22565,5 +22623,5 @@ #. #. item "Waypoints/Services" label "Edit Service Station" -#: build/trans_presets.java:749 +#: build/trans_presets.java:759 msgid "Edit Service Station" msgstr "编辑服务站" @@ -22657,42 +22715,42 @@ #. item "Relations/Directional Route (North America)" text "Operator" #. item "Relations/Route network" text "Operator" -#: build/trans_presets.java:754 build/trans_presets.java:927 -#: build/trans_presets.java:1612 build/trans_presets.java:1636 -#: build/trans_presets.java:1645 build/trans_presets.java:1654 -#: build/trans_presets.java:1661 build/trans_presets.java:1669 -#: build/trans_presets.java:1685 build/trans_presets.java:1692 -#: build/trans_presets.java:1714 build/trans_presets.java:1853 -#: build/trans_presets.java:1950 build/trans_presets.java:1968 -#: build/trans_presets.java:2019 build/trans_presets.java:2036 -#: build/trans_presets.java:2095 build/trans_presets.java:2116 -#: build/trans_presets.java:2152 build/trans_presets.java:2171 -#: build/trans_presets.java:2302 build/trans_presets.java:2312 -#: build/trans_presets.java:2373 build/trans_presets.java:2459 -#: build/trans_presets.java:2484 build/trans_presets.java:2527 -#: build/trans_presets.java:2560 build/trans_presets.java:2588 -#: build/trans_presets.java:2605 build/trans_presets.java:2613 -#: build/trans_presets.java:2625 build/trans_presets.java:2645 -#: build/trans_presets.java:2654 build/trans_presets.java:2661 -#: build/trans_presets.java:2744 build/trans_presets.java:2966 -#: build/trans_presets.java:2975 build/trans_presets.java:3097 -#: build/trans_presets.java:3116 build/trans_presets.java:3135 -#: build/trans_presets.java:3153 build/trans_presets.java:3164 -#: build/trans_presets.java:3180 build/trans_presets.java:3236 -#: build/trans_presets.java:3283 build/trans_presets.java:3291 -#: build/trans_presets.java:3299 build/trans_presets.java:3324 -#: build/trans_presets.java:3439 build/trans_presets.java:3448 -#: build/trans_presets.java:3465 build/trans_presets.java:3474 -#: build/trans_presets.java:3511 build/trans_presets.java:3560 -#: build/trans_presets.java:3583 build/trans_presets.java:3592 -#: build/trans_presets.java:3614 build/trans_presets.java:3629 -#: build/trans_presets.java:3639 build/trans_presets.java:3648 -#: build/trans_presets.java:3676 build/trans_presets.java:3685 -#: build/trans_presets.java:3724 build/trans_presets.java:3740 -#: build/trans_presets.java:3749 build/trans_presets.java:3758 -#: build/trans_presets.java:3774 build/trans_presets.java:3796 -#: build/trans_presets.java:3811 build/trans_presets.java:3820 -#: build/trans_presets.java:4095 build/trans_presets.java:4188 -#: build/trans_presets.java:4337 build/trans_presets.java:4367 -#: build/trans_presets.java:4389 +#: build/trans_presets.java:764 build/trans_presets.java:929 +#: build/trans_presets.java:1611 build/trans_presets.java:1635 +#: build/trans_presets.java:1644 build/trans_presets.java:1653 +#: build/trans_presets.java:1660 build/trans_presets.java:1668 +#: build/trans_presets.java:1684 build/trans_presets.java:1691 +#: build/trans_presets.java:1713 build/trans_presets.java:1854 +#: build/trans_presets.java:1951 build/trans_presets.java:1969 +#: build/trans_presets.java:2020 build/trans_presets.java:2037 +#: build/trans_presets.java:2096 build/trans_presets.java:2117 +#: build/trans_presets.java:2153 build/trans_presets.java:2172 +#: build/trans_presets.java:2303 build/trans_presets.java:2313 +#: build/trans_presets.java:2374 build/trans_presets.java:2460 +#: build/trans_presets.java:2485 build/trans_presets.java:2528 +#: build/trans_presets.java:2561 build/trans_presets.java:2589 +#: build/trans_presets.java:2606 build/trans_presets.java:2614 +#: build/trans_presets.java:2626 build/trans_presets.java:2646 +#: build/trans_presets.java:2655 build/trans_presets.java:2662 +#: build/trans_presets.java:2745 build/trans_presets.java:2967 +#: build/trans_presets.java:2976 build/trans_presets.java:3098 +#: build/trans_presets.java:3117 build/trans_presets.java:3136 +#: build/trans_presets.java:3154 build/trans_presets.java:3165 +#: build/trans_presets.java:3181 build/trans_presets.java:3237 +#: build/trans_presets.java:3284 build/trans_presets.java:3292 +#: build/trans_presets.java:3300 build/trans_presets.java:3325 +#: build/trans_presets.java:3440 build/trans_presets.java:3449 +#: build/trans_presets.java:3466 build/trans_presets.java:3475 +#: build/trans_presets.java:3512 build/trans_presets.java:3561 +#: build/trans_presets.java:3584 build/trans_presets.java:3593 +#: build/trans_presets.java:3615 build/trans_presets.java:3630 +#: build/trans_presets.java:3640 build/trans_presets.java:3649 +#: build/trans_presets.java:3677 build/trans_presets.java:3686 +#: build/trans_presets.java:3725 build/trans_presets.java:3741 +#: build/trans_presets.java:3750 build/trans_presets.java:3759 +#: build/trans_presets.java:3775 build/trans_presets.java:3797 +#: build/trans_presets.java:3812 build/trans_presets.java:3821 +#: build/trans_presets.java:4096 build/trans_presets.java:4189 +#: build/trans_presets.java:4339 build/trans_presets.java:4369 +#: build/trans_presets.java:4391 msgid "Operator" msgstr "经营者" @@ -22701,6 +22759,6 @@ #. item "Waypoints/Rest Area" check "Toilets" #. item "Facilities/Toilets" -#: build/trans_presets.java:755 build/trans_presets.java:765 -#: build/trans_presets.java:2641 +#: build/trans_presets.java:765 build/trans_presets.java:775 +#: build/trans_presets.java:2642 msgid "Toilets" msgstr "厕所" @@ -22708,5 +22766,5 @@ #. #. item "Waypoints/Rest Area" -#: build/trans_presets.java:758 +#: build/trans_presets.java:768 msgid "Rest Area" msgstr "休息区" @@ -22714,5 +22772,5 @@ #. #. item "Waypoints/Rest Area" label "Edit Rest Area" -#: build/trans_presets.java:760 +#: build/trans_presets.java:770 msgid "Edit Rest Area" msgstr "编辑休息区" @@ -22720,5 +22778,5 @@ #. #. item "Waypoints/Emergency Phone" -#: build/trans_presets.java:768 +#: build/trans_presets.java:778 msgid "Emergency Phone" msgstr "紧急电话" @@ -22728,5 +22786,5 @@ #. #. item "Waypoints/Traffic Signal" -#: build/trans_presets.java:773 +#: build/trans_presets.java:783 msgid "Traffic Signal" msgstr "信号灯" @@ -22736,5 +22794,5 @@ #. #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type" -#: build/trans_presets.java:777 +#: build/trans_presets.java:787 msgid "Pedestrian crossing type" msgstr "人行横道类型" @@ -22743,6 +22801,6 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" display value #. item "Transport/Railway/Crossing" combo "Crossing type" display value -#: build/trans_presets.java:777 build/trans_presets.java:799 -#: build/trans_presets.java:1424 +#: build/trans_presets.java:787 build/trans_presets.java:809 +#: build/trans_presets.java:1423 msgid "uncontrolled" msgstr "没有信号灯" @@ -22751,6 +22809,6 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" display value #. item "Transport/Railway/Crossing" combo "Crossing type" display value -#: build/trans_presets.java:777 build/trans_presets.java:799 -#: build/trans_presets.java:1424 +#: build/trans_presets.java:787 build/trans_presets.java:809 +#: build/trans_presets.java:1423 msgid "traffic_signals" msgstr "信号灯" @@ -22759,6 +22817,6 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" display value #. item "Transport/Railway/Crossing" combo "Crossing type" display value -#: build/trans_presets.java:777 build/trans_presets.java:799 -#: build/trans_presets.java:1424 +#: build/trans_presets.java:787 build/trans_presets.java:809 +#: build/trans_presets.java:1423 msgid "island" msgstr "安全岛" @@ -22767,6 +22825,6 @@ #. item "Waypoints/Pedestrian Crossing" combo "Type" display value #. item "Transport/Railway/Crossing" combo "Crossing type" display value -#: build/trans_presets.java:777 build/trans_presets.java:799 -#: build/trans_presets.java:1424 +#: build/trans_presets.java:787 build/trans_presets.java:809 +#: build/trans_presets.java:1423 msgid "unmarked" msgstr "未画标记" @@ -22775,6 +22833,6 @@ #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback" #. item "Transport/Railway/Crossing" check "Cross on horseback" -#: build/trans_presets.java:778 build/trans_presets.java:801 -#: build/trans_presets.java:1425 +#: build/trans_presets.java:788 build/trans_presets.java:811 +#: build/trans_presets.java:1424 msgid "Cross on horseback" msgstr "骑马穿越" @@ -22783,6 +22841,6 @@ #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle" #. item "Transport/Railway/Crossing" check "Cross by bicycle" -#: build/trans_presets.java:779 build/trans_presets.java:800 -#: build/trans_presets.java:1426 +#: build/trans_presets.java:789 build/trans_presets.java:810 +#: build/trans_presets.java:1425 msgid "Cross by bicycle" msgstr "以自行车穿越" @@ -22791,11 +22849,11 @@ #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant" #. item "Transport/Railway/Crossing" check "Crossing attendant" -#: build/trans_presets.java:780 build/trans_presets.java:802 -#: build/trans_presets.java:1427 +#: build/trans_presets.java:790 build/trans_presets.java:812 +#: build/trans_presets.java:1426 msgid "Crossing attendant" msgstr "有人陪同穿越" #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" -#: build/trans_presets.java:781 +#: build/trans_presets.java:791 msgid "Crossing type name (UK)" msgstr "人行横道类型名称 (英国)" @@ -22803,5 +22861,5 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value -#: build/trans_presets.java:781 build/trans_presets.java:803 +#: build/trans_presets.java:791 build/trans_presets.java:813 msgid "zebra" msgstr "斑马线" @@ -22809,5 +22867,5 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value -#: build/trans_presets.java:781 build/trans_presets.java:803 +#: build/trans_presets.java:791 build/trans_presets.java:813 msgid "pelican" msgstr "" @@ -22815,5 +22873,5 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value -#: build/trans_presets.java:781 build/trans_presets.java:803 +#: build/trans_presets.java:791 build/trans_presets.java:813 msgid "toucan" msgstr "" @@ -22821,5 +22879,5 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value -#: build/trans_presets.java:781 build/trans_presets.java:803 +#: build/trans_presets.java:791 build/trans_presets.java:813 msgid "puffin" msgstr "" @@ -22827,5 +22885,5 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value -#: build/trans_presets.java:781 build/trans_presets.java:803 +#: build/trans_presets.java:791 build/trans_presets.java:813 msgid "pegasus" msgstr "" @@ -22833,5 +22891,5 @@ #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)" display value #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" display value -#: build/trans_presets.java:781 build/trans_presets.java:803 +#: build/trans_presets.java:791 build/trans_presets.java:813 msgid "tiger" msgstr "" @@ -22839,5 +22897,5 @@ #. #. item "Waypoints/Stop" -#: build/trans_presets.java:784 +#: build/trans_presets.java:794 msgid "Stop" msgstr "禁止通行" @@ -22845,5 +22903,5 @@ #. #. item "Waypoints/Mini-roundabout" -#: build/trans_presets.java:787 +#: build/trans_presets.java:797 msgid "Mini-roundabout" msgstr "小型环岛" @@ -22854,15 +22912,15 @@ #. #. item "Waypoints/Mini-roundabout" combo "Direction" -#: build/trans_presets.java:792 +#: build/trans_presets.java:802 msgid "Direction" msgstr "方向" #. item "Waypoints/Mini-roundabout" combo "Direction" display value -#: build/trans_presets.java:792 +#: build/trans_presets.java:802 msgid "clockwise" msgstr "顺时针" #. item "Waypoints/Pedestrian Crossing" -#: build/trans_presets.java:794 +#: build/trans_presets.java:804 msgid "Pedestrian Crossing" msgstr "人行横道" @@ -22871,15 +22929,15 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" /> #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing" -#: build/trans_presets.java:797 +#: build/trans_presets.java:807 msgid "Edit Crossing" msgstr "编辑人行横道" #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)" -#: build/trans_presets.java:803 +#: build/trans_presets.java:813 msgid "Type name (UK)" msgstr "类型名称(英国)" #. item "Waypoints/Traffic Calming" -#: build/trans_presets.java:805 +#: build/trans_presets.java:815 msgid "Traffic Calming" msgstr "道路减速设施" @@ -22887,40 +22945,40 @@ #. #. item "Waypoints/Traffic Calming" label "Edit Traffic Calming" -#: build/trans_presets.java:807 +#: build/trans_presets.java:817 msgid "Edit Traffic Calming" msgstr "编辑道路减速设施" #. item "Waypoints/Traffic Calming" combo "Type" display value -#: build/trans_presets.java:808 +#: build/trans_presets.java:818 msgid "bump" msgstr "" #. item "Waypoints/Traffic Calming" combo "Type" display value -#: build/trans_presets.java:808 +#: build/trans_presets.java:818 msgid "chicane" msgstr "" #. item "Waypoints/Traffic Calming" combo "Type" display value -#: build/trans_presets.java:808 +#: build/trans_presets.java:818 msgid "choker" msgstr "" #. item "Waypoints/Traffic Calming" combo "Type" display value -#: build/trans_presets.java:808 +#: build/trans_presets.java:818 msgid "cushion" msgstr "" #. item "Waypoints/Traffic Calming" combo "Type" display value -#: build/trans_presets.java:808 +#: build/trans_presets.java:818 msgid "hump" msgstr "" #. item "Waypoints/Traffic Calming" combo "Type" display value -#: build/trans_presets.java:808 +#: build/trans_presets.java:818 msgid "table" msgstr "" #. item "Waypoints/Passing Place" -#: build/trans_presets.java:810 +#: build/trans_presets.java:820 msgid "Passing Place" msgstr "让车处" @@ -22928,5 +22986,5 @@ #. #. item "Waypoints/Passing Place" label "Edit Passing Place" -#: build/trans_presets.java:812 +#: build/trans_presets.java:822 msgid "Edit Passing Place" msgstr "编辑让车处" @@ -22934,5 +22992,5 @@ #. #. item "Waypoints/Turning Circle" -#: build/trans_presets.java:815 +#: build/trans_presets.java:825 msgid "Turning Circle" msgstr "回旋圈" @@ -22942,5 +23000,5 @@ #. #. item "Waypoints/City Limit" -#: build/trans_presets.java:820 +#: build/trans_presets.java:830 msgid "City Limit" msgstr "城市边界" @@ -22948,15 +23006,15 @@ #. #. item "Waypoints/City Limit" label "Edit City Limit Sign" -#: build/trans_presets.java:822 +#: build/trans_presets.java:832 msgid "Edit City Limit Sign" msgstr "编辑城市边界标志" #. item "Waypoints/City Limit" text "Second Name" -#: build/trans_presets.java:827 +#: build/trans_presets.java:837 msgid "Second Name" msgstr "第二名称" #. item "Waypoints/Speed Camera" -#: build/trans_presets.java:829 +#: build/trans_presets.java:839 msgid "Speed Camera" msgstr "测速照相" @@ -22966,5 +23024,5 @@ #. #. item "Waypoints/Grit Bin" -#: build/trans_presets.java:834 +#: build/trans_presets.java:844 msgid "Grit Bin" msgstr "除雪沙/盐箱" @@ -22973,17 +23031,6 @@ #. #. -#. item "Waypoints/Ford" -#: build/trans_presets.java:839 -msgid "Ford" -msgstr "浅滩" - -#. item "Waypoints/Ford" label "Edit Ford" -#: build/trans_presets.java:840 -msgid "Edit Ford" -msgstr "编辑浅滩" - -#. #. item "Waypoints/Mountain Pass" -#: build/trans_presets.java:847 +#: build/trans_presets.java:849 msgid "Mountain Pass" msgstr "隘口" @@ -22991,5 +23038,5 @@ #. #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass" -#: build/trans_presets.java:849 +#: build/trans_presets.java:851 msgid "Edit Mountain Pass" msgstr "编辑隘口" @@ -23001,7 +23048,7 @@ #. item "Geography/Glacier" text "Elevation" #. item "Geography/Volcano" text "Elevation" -#: build/trans_presets.java:854 build/trans_presets.java:2037 -#: build/trans_presets.java:2286 build/trans_presets.java:3961 -#: build/trans_presets.java:3969 build/trans_presets.java:3977 +#: build/trans_presets.java:856 build/trans_presets.java:2038 +#: build/trans_presets.java:2287 build/trans_presets.java:3962 +#: build/trans_presets.java:3970 build/trans_presets.java:3978 msgid "Elevation" msgstr "海拔" @@ -23036,18 +23083,18 @@ #. #. item "Annotation/Contact" text "Wikipedia" -#: build/trans_presets.java:855 build/trans_presets.java:1111 -#: build/trans_presets.java:1122 build/trans_presets.java:1136 -#: build/trans_presets.java:1151 build/trans_presets.java:1879 -#: build/trans_presets.java:2341 build/trans_presets.java:2412 -#: build/trans_presets.java:3339 build/trans_presets.java:3870 -#: build/trans_presets.java:3877 build/trans_presets.java:3884 -#: build/trans_presets.java:3891 build/trans_presets.java:3898 -#: build/trans_presets.java:3906 build/trans_presets.java:3914 -#: build/trans_presets.java:3922 build/trans_presets.java:3929 -#: build/trans_presets.java:3936 build/trans_presets.java:3943 -#: build/trans_presets.java:3952 build/trans_presets.java:3962 -#: build/trans_presets.java:3970 build/trans_presets.java:3978 -#: build/trans_presets.java:3985 build/trans_presets.java:3994 -#: build/trans_presets.java:4002 build/trans_presets.java:4267 +#: build/trans_presets.java:857 build/trans_presets.java:1110 +#: build/trans_presets.java:1121 build/trans_presets.java:1135 +#: build/trans_presets.java:1150 build/trans_presets.java:1880 +#: build/trans_presets.java:2342 build/trans_presets.java:2413 +#: build/trans_presets.java:3340 build/trans_presets.java:3871 +#: build/trans_presets.java:3878 build/trans_presets.java:3885 +#: build/trans_presets.java:3892 build/trans_presets.java:3899 +#: build/trans_presets.java:3907 build/trans_presets.java:3915 +#: build/trans_presets.java:3923 build/trans_presets.java:3930 +#: build/trans_presets.java:3937 build/trans_presets.java:3944 +#: build/trans_presets.java:3953 build/trans_presets.java:3963 +#: build/trans_presets.java:3971 build/trans_presets.java:3979 +#: build/trans_presets.java:3986 build/trans_presets.java:3995 +#: build/trans_presets.java:4003 build/trans_presets.java:4268 msgid "Wikipedia" msgstr "维基百科" @@ -23055,5 +23102,5 @@ #. #. group "Barriers" -#: build/trans_presets.java:859 +#: build/trans_presets.java:861 msgid "Barriers" msgstr "障碍物" @@ -23061,5 +23108,5 @@ #. #. item "Barriers/Bollard" -#: build/trans_presets.java:862 +#: build/trans_presets.java:864 msgid "Bollard" msgstr "车阻柱" @@ -23067,5 +23114,5 @@ #. #. item "Barriers/Bollard" label "Edit Bollard" -#: build/trans_presets.java:864 +#: build/trans_presets.java:866 msgid "Edit Bollard" msgstr "编辑车阻柱" @@ -23115,27 +23162,27 @@ #. #. item "Barriers/Sally Port" label "Allowed traffic:" -#: build/trans_presets.java:867 build/trans_presets.java:877 -#: build/trans_presets.java:886 build/trans_presets.java:898 -#: build/trans_presets.java:912 build/trans_presets.java:934 -#: build/trans_presets.java:977 build/trans_presets.java:990 -#: build/trans_presets.java:1002 build/trans_presets.java:1014 -#: build/trans_presets.java:1026 build/trans_presets.java:1038 -#: build/trans_presets.java:1048 build/trans_presets.java:1057 -#: build/trans_presets.java:1066 +#: build/trans_presets.java:869 build/trans_presets.java:879 +#: build/trans_presets.java:888 build/trans_presets.java:900 +#: build/trans_presets.java:914 build/trans_presets.java:936 +#: build/trans_presets.java:976 build/trans_presets.java:989 +#: build/trans_presets.java:1001 build/trans_presets.java:1013 +#: build/trans_presets.java:1025 build/trans_presets.java:1037 +#: build/trans_presets.java:1047 build/trans_presets.java:1056 +#: build/trans_presets.java:1065 msgid "Allowed traffic:" msgstr "允许通行方向：" #. item "Barriers/Cycle Barrier" -#: build/trans_presets.java:874 +#: build/trans_presets.java:876 msgid "Cycle Barrier" msgstr "自行车护栏" #. item "Barriers/Block" -#: build/trans_presets.java:884 +#: build/trans_presets.java:886 msgid "Block" msgstr "水泥护栏" #. item "Barriers/Cattle Grid" -#: build/trans_presets.java:893 +#: build/trans_presets.java:895 msgid "Cattle Grid" msgstr "家畜栅栏" @@ -23143,10 +23190,10 @@ #. #. item "Barriers/Cattle Grid" label "Edit Cattle Grid" -#: build/trans_presets.java:895 +#: build/trans_presets.java:897 msgid "Edit Cattle Grid" msgstr "编辑家畜栅栏" #. item "Barriers/Bus Trap" -#: build/trans_presets.java:905 +#: build/trans_presets.java:907 msgid "Bus Trap" msgstr "公交车专用道障碍" @@ -23154,15 +23201,15 @@ #. #. item "Barriers/Spikes" -#: build/trans_presets.java:908 +#: build/trans_presets.java:910 msgid "Spikes" msgstr "长钉" #. item "Barriers/Spikes" label "Edit Spikes" -#: build/trans_presets.java:909 +#: build/trans_presets.java:911 msgid "Edit Spikes" msgstr "编辑长钉" #. item "Barriers/Toll Booth" -#: build/trans_presets.java:920 +#: build/trans_presets.java:922 msgid "Toll Booth" msgstr "收费站" @@ -23170,5 +23217,5 @@ #. #. item "Barriers/Toll Booth" label "Edit Toll Booth" -#: build/trans_presets.java:922 +#: build/trans_presets.java:924 msgid "Edit Toll Booth" msgstr "编辑收费站" @@ -23176,10 +23223,10 @@ #. #. item "Barriers/Border Control" -#: build/trans_presets.java:930 +#: build/trans_presets.java:932 msgid "Border Control" msgstr "国境管控站" #. item "Barriers/Border Control" label "Edit Border Control" -#: build/trans_presets.java:931 +#: build/trans_presets.java:933 msgid "Edit Border Control" msgstr "编辑国境管控站" @@ -23188,5 +23235,5 @@ #. #. item "Barriers/Hedge" -#: build/trans_presets.java:945 +#: build/trans_presets.java:947 msgid "Hedge" msgstr "树篱" @@ -23195,24 +23242,43 @@ #. #. item "Barriers/Fence" -#: build/trans_presets.java:949 +#: build/trans_presets.java:951 msgid "Fence" msgstr "围栏" -#. -#. -#. item "Barriers/Wire Fence" -#: build/trans_presets.java:953 -msgid "Wire Fence" -msgstr "铁丝网" - -#. -#. item "Barriers/Wood Fence" -#: build/trans_presets.java:956 -msgid "Wood Fence" -msgstr "木围栏" - -#. +#. item "Barriers/Fence" combo "Type" display value +#: build/trans_presets.java:955 +msgid "barbed_wire" +msgstr "" + +#. item "Barriers/Fence" combo "Type" display value +#: build/trans_presets.java:955 +msgid "chain" +msgstr "" + +#. item "Barriers/Fence" combo "Type" display value +#. item "Leisure/Public Grill" combo "Fuel" display value +#: build/trans_presets.java:955 build/trans_presets.java:2398 +msgid "electric" +msgstr "电" + +#. item "Barriers/Fence" combo "Type" display value +#: build/trans_presets.java:955 +msgid "hedge" +msgstr "" + +#. item "Barriers/Fence" combo "Type" display value +#. item "Facilities/Clock" combo "Support" display value +#: build/trans_presets.java:955 build/trans_presets.java:2677 +msgid "pole" +msgstr "杆" + +#. item "Barriers/Fence" combo "Type" display value +#: build/trans_presets.java:955 +msgid "split_rail" +msgstr "" + +#. #. item "Barriers/Wall" -#: build/trans_presets.java:959 +#: build/trans_presets.java:958 msgid "Wall" msgstr "墙" @@ -23220,5 +23286,5 @@ #. #. item "Barriers/City Wall" -#: build/trans_presets.java:962 +#: build/trans_presets.java:961 msgid "City Wall" msgstr "城墙" @@ -23227,5 +23293,5 @@ #. #. item "Barriers/Retaining Wall" -#: build/trans_presets.java:966 +#: build/trans_presets.java:965 msgid "Retaining Wall" msgstr "挡土墙" @@ -23236,15 +23302,15 @@ #. #. item "Barriers/Entrance" -#: build/trans_presets.java:973 +#: build/trans_presets.java:972 msgid "Entrance" msgstr "入口" #. item "Barriers/Entrance" label "Edit Entrance" -#: build/trans_presets.java:974 +#: build/trans_presets.java:973 msgid "Edit Entrance" msgstr "编辑入口" #. item "Barriers/Gate" -#: build/trans_presets.java:985 +#: build/trans_presets.java:984 msgid "Gate" msgstr "门" @@ -23252,50 +23318,50 @@ #. #. item "Barriers/Gate" label "Edit Gate" -#: build/trans_presets.java:987 +#: build/trans_presets.java:986 msgid "Edit Gate" msgstr "编辑门" #. item "Barriers/Lift Gate" +#: build/trans_presets.java:997 +msgid "Lift Gate" +msgstr "" + +#. item "Barriers/Lift Gate" label "Edit Lift Gate" #: build/trans_presets.java:998 -msgid "Lift Gate" -msgstr "" - -#. item "Barriers/Lift Gate" label "Edit Lift Gate" -#: build/trans_presets.java:999 msgid "Edit Lift Gate" msgstr "" #. item "Barriers/Hampshire Gate" +#: build/trans_presets.java:1009 +msgid "Hampshire Gate" +msgstr "" + +#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate" #: build/trans_presets.java:1010 -msgid "Hampshire Gate" -msgstr "" - -#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate" -#: build/trans_presets.java:1011 msgid "Edit Hampshire Gate" msgstr "" #. item "Barriers/Bump Gate" +#: build/trans_presets.java:1021 +msgid "Bump Gate" +msgstr "" + +#. item "Barriers/Bump Gate" label "Edit Bump Gate" #: build/trans_presets.java:1022 -msgid "Bump Gate" -msgstr "" - -#. item "Barriers/Bump Gate" label "Edit Bump Gate" -#: build/trans_presets.java:1023 msgid "Edit Bump Gate" msgstr "" #. item "Barriers/Kissing Gate" +#: build/trans_presets.java:1033 +msgid "Kissing Gate" +msgstr "" + +#. item "Barriers/Kissing Gate" label "Edit Kissing Gate" #: build/trans_presets.java:1034 -msgid "Kissing Gate" -msgstr "" - -#. item "Barriers/Kissing Gate" label "Edit Kissing Gate" -#: build/trans_presets.java:1035 msgid "Edit Kissing Gate" msgstr "" #. item "Barriers/Stile" -#: build/trans_presets.java:1043 +#: build/trans_presets.java:1042 msgid "Stile" msgstr "栅栏台阶" @@ -23303,25 +23369,25 @@ #. #. item "Barriers/Stile" label "Edit Stile" -#: build/trans_presets.java:1045 +#: build/trans_presets.java:1044 msgid "Edit Stile" msgstr "编辑栅栏台阶" #. item "Barriers/Turnstile" -#: build/trans_presets.java:1053 +#: build/trans_presets.java:1052 msgid "Turnstile" msgstr "旋转栅门" #. item "Barriers/Turnstile" label "Edit Turnstile" -#: build/trans_presets.java:1054 +#: build/trans_presets.java:1053 msgid "Edit Turnstile" msgstr "编辑旋转栅门" #. item "Barriers/Sally Port" -#: build/trans_presets.java:1062 +#: build/trans_presets.java:1061 msgid "Sally Port" msgstr "城门" #. item "Barriers/Sally Port" label "Edit Sally Port" -#: build/trans_presets.java:1063 +#: build/trans_presets.java:1062 msgid "Edit Sally Port" msgstr "编辑城门" @@ -23331,6 +23397,6 @@ #. #. item "Water/Water/Water" -#: build/trans_presets.java:1077 build/trans_presets.java:1078 -#: build/trans_presets.java:1179 +#: build/trans_presets.java:1076 build/trans_presets.java:1077 +#: build/trans_presets.java:1178 msgid "Water" msgstr "水域" @@ -23338,5 +23404,5 @@ #. #. item "Water/Water/Drain" -#: build/trans_presets.java:1080 +#: build/trans_presets.java:1079 msgid "Drain" msgstr "渠" @@ -23344,10 +23410,10 @@ #. #. item "Water/Water/Drain" label "Edit Drain" -#: build/trans_presets.java:1082 +#: build/trans_presets.java:1081 msgid "Edit Drain" msgstr "编辑渠" #. item "Water/Water/Ditch" -#: build/trans_presets.java:1088 +#: build/trans_presets.java:1087 msgid "Ditch" msgstr "沟" @@ -23355,10 +23421,10 @@ #. #. item "Water/Water/Ditch" label "Edit Ditch" -#: build/trans_presets.java:1090 +#: build/trans_presets.java:1089 msgid "Edit Ditch" msgstr "编辑沟" #. item "Water/Water/Stream" -#: build/trans_presets.java:1096 +#: build/trans_presets.java:1095 msgid "Stream" msgstr "溪流" @@ -23366,10 +23432,10 @@ #. #. item "Water/Water/Stream" label "Edit Stream" -#: build/trans_presets.java:1098 +#: build/trans_presets.java:1097 msgid "Edit Stream" msgstr "编辑溪流" #. item "Water/Water/Canal" -#: build/trans_presets.java:1104 +#: build/trans_presets.java:1103 msgid "Canal" msgstr "运河" @@ -23377,10 +23443,10 @@ #. #. item "Water/Water/Canal" label "Edit Canal" -#: build/trans_presets.java:1106 +#: build/trans_presets.java:1105 msgid "Edit Canal" msgstr "编辑运河" #. item "Water/Water/River" -#: build/trans_presets.java:1113 +#: build/trans_presets.java:1112 msgid "River" msgstr "河流" @@ -23390,5 +23456,5 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" /> #. item "Water/Water/River" label "Edit River" -#: build/trans_presets.java:1117 +#: build/trans_presets.java:1116 msgid "Edit River" msgstr "编辑河流" @@ -23396,5 +23462,5 @@ #. #. item "Water/Water/Spring" -#: build/trans_presets.java:1125 +#: build/trans_presets.java:1124 msgid "Spring" msgstr "泉" @@ -23402,20 +23468,20 @@ #. #. item "Water/Water/Spring" label "Edit Spring" -#: build/trans_presets.java:1127 +#: build/trans_presets.java:1126 msgid "Edit Spring" msgstr "编辑泉" #. item "Water/Water/Waterfall" -#: build/trans_presets.java:1131 +#: build/trans_presets.java:1130 msgid "Waterfall" msgstr "瀑布" #. item "Water/Water/Waterfall" label "Edit Waterfall" -#: build/trans_presets.java:1132 +#: build/trans_presets.java:1131 msgid "Edit Waterfall" msgstr "编辑瀑布" #. item "Water/Water/Weir" -#: build/trans_presets.java:1138 +#: build/trans_presets.java:1137 msgid "Weir" msgstr "堰" @@ -23423,10 +23489,10 @@ #. #. item "Water/Water/Weir" label "Edit Weir" -#: build/trans_presets.java:1140 +#: build/trans_presets.java:1139 msgid "Edit Weir" msgstr "编辑堰" #. item "Water/Water/Dam" -#: build/trans_presets.java:1145 +#: build/trans_presets.java:1144 msgid "Dam" msgstr "水坝" @@ -23434,10 +23500,10 @@ #. #. item "Water/Water/Dam" label "Edit Dam" -#: build/trans_presets.java:1147 +#: build/trans_presets.java:1146 msgid "Edit Dam" msgstr "编辑水坝" #. item "Water/Water/Groyne" -#: build/trans_presets.java:1153 +#: build/trans_presets.java:1152 msgid "Groyne" msgstr "防波堤" @@ -23445,5 +23511,5 @@ #. #. item "Water/Water/Groyne" label "Edit Groyne" -#: build/trans_presets.java:1155 +#: build/trans_presets.java:1154 msgid "Edit Groyne" msgstr "编辑防波堤" @@ -23453,15 +23519,15 @@ #. #. item "Water/Water/Basin" -#: build/trans_presets.java:1160 +#: build/trans_presets.java:1159 msgid "Basin" msgstr "水池" #. item "Water/Water/Basin" label "Edit Basin Landuse" -#: build/trans_presets.java:1161 +#: build/trans_presets.java:1160 msgid "Edit Basin Landuse" msgstr "编辑水池" #. item "Water/Water/Reservoir" -#: build/trans_presets.java:1166 +#: build/trans_presets.java:1165 msgid "Reservoir" msgstr "贮水处" @@ -23469,15 +23535,15 @@ #. #. item "Water/Water/Reservoir" label "Edit Reservoir Landuse" -#: build/trans_presets.java:1168 +#: build/trans_presets.java:1167 msgid "Edit Reservoir Landuse" msgstr "编辑贮水处" #. item "Water/Water/Covered Reservoir" -#: build/trans_presets.java:1173 +#: build/trans_presets.java:1172 msgid "Covered Reservoir" msgstr "有覆盖的贮水处" #. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir" -#: build/trans_presets.java:1174 +#: build/trans_presets.java:1173 msgid "Edit Covered Reservoir" msgstr "编辑有覆盖的贮水处" @@ -23485,20 +23551,20 @@ #. #. item "Water/Water/Water" label "Edit Water" -#: build/trans_presets.java:1181 +#: build/trans_presets.java:1180 msgid "Edit Water" msgstr "编辑水域" #. item "Water/Water/Land" -#: build/trans_presets.java:1185 +#: build/trans_presets.java:1184 msgid "Land" msgstr "陆地" #. item "Water/Water/Land" label "Edit Land" -#: build/trans_presets.java:1186 +#: build/trans_presets.java:1185 msgid "Edit Land" msgstr "编辑陆地" #. item "Water/Water/Coastline" -#: build/trans_presets.java:1190 +#: build/trans_presets.java:1189 msgid "Coastline" msgstr "海岸线" @@ -23506,10 +23572,10 @@ #. #. item "Water/Water/Coastline" label "Edit Coastline" -#: build/trans_presets.java:1192 +#: build/trans_presets.java:1191 msgid "Edit Coastline" msgstr "编辑海岸线" #. item "Water/Water/Riverbank" -#: build/trans_presets.java:1196 +#: build/trans_presets.java:1195 msgid "Riverbank" msgstr "河岸" @@ -23518,5 +23584,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" /> #. item "Water/Water/Riverbank" label "Edit Riverbank" -#: build/trans_presets.java:1199 +#: build/trans_presets.java:1198 msgid "Edit Riverbank" msgstr "编辑河岸" @@ -23524,5 +23590,5 @@ #. #. item "Water/Water/Wetland" -#: build/trans_presets.java:1204 +#: build/trans_presets.java:1203 msgid "Wetland" msgstr "湿地" @@ -23533,15 +23599,15 @@ #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" /> #. item "Water/Water/Wetland" label "Edit Wetland" -#: build/trans_presets.java:1209 +#: build/trans_presets.java:1208 msgid "Edit Wetland" msgstr "编辑湿地" #. item "Water/Water/Wetland" combo "Type" display value -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1211 msgid "swamp" msgstr "沼泽(swamp)" #. item "Water/Water/Wetland" combo "Type" display value -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1211 msgid "bog" msgstr "沼泽(bog)" @@ -23554,40 +23620,40 @@ #. #. color marsh -#: build/trans_presets.java:1212 build/trans_style.java:2930 +#: build/trans_presets.java:1211 build/trans_style.java:2945 msgid "marsh" msgstr "沼泽(marsh)" #. item "Water/Water/Wetland" combo "Type" display value -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1211 msgid "reedbed" msgstr "芦苇荡" #. item "Water/Water/Wetland" combo "Type" display value -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1211 msgid "saltmarsh" msgstr "盐碱滩" #. item "Water/Water/Wetland" combo "Type" display value -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1211 msgid "tidalflat" msgstr "滩涂" #. item "Water/Water/Wetland" combo "Type" display value -#: build/trans_presets.java:1212 +#: build/trans_presets.java:1211 msgid "mangrove" msgstr "红树林" #. item "Water/Water/Mud" -#: build/trans_presets.java:1214 +#: build/trans_presets.java:1213 msgid "Mud" msgstr "泥浆地" #. item "Water/Water/Mud" label "Edit Mud" -#: build/trans_presets.java:1215 +#: build/trans_presets.java:1214 msgid "Edit Mud" msgstr "编辑泥浆地" #. item "Water/Water/Beach" -#: build/trans_presets.java:1219 +#: build/trans_presets.java:1218 msgid "Beach" msgstr "海滩" @@ -23595,20 +23661,20 @@ #. #. item "Water/Water/Beach" label "Edit Beach" -#: build/trans_presets.java:1221 +#: build/trans_presets.java:1220 msgid "Edit Beach" msgstr "编辑海滩" #. item "Water/Water/Bay" -#: build/trans_presets.java:1225 +#: build/trans_presets.java:1224 msgid "Bay" msgstr "海湾" #. item "Water/Water/Bay" label "Edit Bay" -#: build/trans_presets.java:1226 +#: build/trans_presets.java:1225 msgid "Edit Bay" msgstr "编辑海湾" #. item "Water/Water/Cliff" -#: build/trans_presets.java:1230 +#: build/trans_presets.java:1229 msgid "Cliff" msgstr "断崖" @@ -23616,15 +23682,15 @@ #. #. item "Water/Water/Cliff" label "Edit Cliff" -#: build/trans_presets.java:1232 +#: build/trans_presets.java:1231 msgid "Edit Cliff" msgstr "编辑断崖" #. group "Shipping" -#: build/trans_presets.java:1237 +#: build/trans_presets.java:1236 msgid "Shipping" msgstr "船运" #. item "Shipping/Ferry Terminal" -#: build/trans_presets.java:1238 +#: build/trans_presets.java:1237 msgid "Ferry Terminal" msgstr "渡轮端点" @@ -23632,20 +23698,20 @@ #. #. item "Shipping/Ferry Terminal" label "Edit Ferry Terminal" -#: build/trans_presets.java:1240 +#: build/trans_presets.java:1239 msgid "Edit Ferry Terminal" msgstr "编辑渡轮端点" #. item "Shipping/Ferry Terminal" combo "Cargo" -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1242 msgid "Cargo" msgstr "装载物" #. item "Shipping/Ferry Terminal" combo "Cargo" display value -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1242 msgid "passengers" msgstr "乘客" #. item "Shipping/Ferry Terminal" combo "Cargo" display value -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1242 msgid "vehicle" msgstr "车辆" @@ -23731,26 +23797,26 @@ #. #. color bicycle -#: build/trans_presets.java:1243 build/trans_presets.java:4330 -#: build/trans_presets.java:4360 build/trans_style.java:189 -#: build/trans_style.java:525 build/trans_style.java:545 -#: build/trans_style.java:551 build/trans_style.java:570 -#: build/trans_style.java:577 build/trans_style.java:753 -#: build/trans_style.java:759 build/trans_style.java:765 -#: build/trans_style.java:771 build/trans_style.java:777 +#: build/trans_presets.java:1242 build/trans_presets.java:4332 +#: build/trans_presets.java:4362 build/trans_style.java:189 +#: build/trans_style.java:519 build/trans_style.java:539 +#: build/trans_style.java:545 build/trans_style.java:564 +#: build/trans_style.java:571 build/trans_style.java:747 +#: build/trans_style.java:753 build/trans_style.java:759 +#: build/trans_style.java:765 build/trans_style.java:771 msgid "bicycle" msgstr "单车" #. item "Shipping/Ferry Terminal" combo "Cargo" display value -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1242 msgid "hgv" msgstr "大型货车" #. item "Shipping/Ferry Terminal" combo "Cargo" display value -#: build/trans_presets.java:1243 +#: build/trans_presets.java:1242 msgid "passengers;vehicle" msgstr "旅客和车辆" #. item "Shipping/Ferry Route" -#: build/trans_presets.java:1245 +#: build/trans_presets.java:1244 msgid "Ferry Route" msgstr "渡轮路线" @@ -23758,5 +23824,5 @@ #. #. item "Shipping/Ferry Route" label "Edit Ferry" -#: build/trans_presets.java:1247 +#: build/trans_presets.java:1246 msgid "Edit Ferry" msgstr "编辑渡轮" @@ -23765,15 +23831,15 @@ #. #. item "Shipping/Marina" -#: build/trans_presets.java:1255 +#: build/trans_presets.java:1254 msgid "Marina" msgstr "码头" #. item "Shipping/Marina" label "Edit Marina" -#: build/trans_presets.java:1256 +#: build/trans_presets.java:1255 msgid "Edit Marina" msgstr "编辑码头" #. item "Shipping/Pier" -#: build/trans_presets.java:1260 +#: build/trans_presets.java:1259 msgid "Pier" msgstr "渡头" @@ -23781,10 +23847,10 @@ #. #. item "Shipping/Pier" label "Edit Pier" -#: build/trans_presets.java:1262 +#: build/trans_presets.java:1261 msgid "Edit Pier" msgstr "编辑渡头" #. item "Shipping/Lock Gate" -#: build/trans_presets.java:1266 +#: build/trans_presets.java:1265 msgid "Lock Gate" msgstr "水闸" @@ -23793,5 +23859,5 @@ #. #. item "Shipping/Turning Point" -#: build/trans_presets.java:1270 +#: build/trans_presets.java:1269 msgid "Turning Point" msgstr "回旋点" @@ -23801,5 +23867,5 @@ #. #. item "Shipping/Slipway" -#: build/trans_presets.java:1275 +#: build/trans_presets.java:1274 msgid "Slipway" msgstr "船台" @@ -23809,10 +23875,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" /> #. item "Shipping/Slipway" label "Edit Slipway" -#: build/trans_presets.java:1279 +#: build/trans_presets.java:1278 msgid "Edit Slipway" msgstr "编辑造船台" #. item "Shipping/Boatyard" -#: build/trans_presets.java:1283 +#: build/trans_presets.java:1282 msgid "Boatyard" msgstr "船厂" @@ -23820,10 +23886,10 @@ #. #. item "Shipping/Boatyard" label "Edit Boatyard" -#: build/trans_presets.java:1285 +#: build/trans_presets.java:1284 msgid "Edit Boatyard" msgstr "编辑船厂" #. item "Shipping/Dock" -#: build/trans_presets.java:1290 +#: build/trans_presets.java:1289 msgid "Dock" msgstr "船坞" @@ -23831,20 +23897,20 @@ #. #. item "Shipping/Dock" label "Edit Dock" -#: build/trans_presets.java:1292 +#: build/trans_presets.java:1291 msgid "Edit Dock" msgstr "编辑船坞" #. group "Transport" -#: build/trans_presets.java:1299 +#: build/trans_presets.java:1298 msgid "Transport" msgstr "运输" #. group "Transport/Railway" -#: build/trans_presets.java:1300 +#: build/trans_presets.java:1299 msgid "Railway" msgstr "铁路" #. item "Transport/Railway/Rail" -#: build/trans_presets.java:1301 +#: build/trans_presets.java:1300 msgid "Rail" msgstr "轨道" @@ -23852,5 +23918,5 @@ #. #. item "Transport/Railway/Rail" label "Edit Rail" -#: build/trans_presets.java:1303 +#: build/trans_presets.java:1302 msgid "Edit Rail" msgstr "编辑轨道" @@ -23880,7 +23946,7 @@ #. #. item "Transport/Railway/Tram" combo "Gauge (mm)" -#: build/trans_presets.java:1307 build/trans_presets.java:1319 -#: build/trans_presets.java:1343 build/trans_presets.java:1355 -#: build/trans_presets.java:1367 build/trans_presets.java:1379 +#: build/trans_presets.java:1306 build/trans_presets.java:1318 +#: build/trans_presets.java:1342 build/trans_presets.java:1354 +#: build/trans_presets.java:1366 build/trans_presets.java:1378 msgid "Gauge (mm)" msgstr "轨距(mm)" @@ -23896,8 +23962,8 @@ #. item "Transport/Railway/Subway" combo "Types" #. item "Transport/Railway/Tram" combo "Types" -#: build/trans_presets.java:1308 build/trans_presets.java:1320 -#: build/trans_presets.java:1332 build/trans_presets.java:1344 -#: build/trans_presets.java:1356 build/trans_presets.java:1368 -#: build/trans_presets.java:1380 +#: build/trans_presets.java:1307 build/trans_presets.java:1319 +#: build/trans_presets.java:1331 build/trans_presets.java:1343 +#: build/trans_presets.java:1355 build/trans_presets.java:1367 +#: build/trans_presets.java:1379 msgid "Types" msgstr "类型" @@ -23911,8 +23977,8 @@ #. item "Transport/Railway/Tram" combo "Types" display value #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value -#: build/trans_presets.java:1308 build/trans_presets.java:1320 -#: build/trans_presets.java:1332 build/trans_presets.java:1344 -#: build/trans_presets.java:1356 build/trans_presets.java:1368 -#: build/trans_presets.java:1380 build/trans_presets.java:1410 +#: build/trans_presets.java:1307 build/trans_presets.java:1319 +#: build/trans_presets.java:1331 build/trans_presets.java:1343 +#: build/trans_presets.java:1355 build/trans_presets.java:1367 +#: build/trans_presets.java:1379 build/trans_presets.java:1409 msgid "yard" msgstr "干线" @@ -23926,8 +23992,8 @@ #. item "Transport/Railway/Tram" combo "Types" display value #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value -#: build/trans_presets.java:1308 build/trans_presets.java:1320 -#: build/trans_presets.java:1332 build/trans_presets.java:1344 -#: build/trans_presets.java:1356 build/trans_presets.java:1368 -#: build/trans_presets.java:1380 build/trans_presets.java:1410 +#: build/trans_presets.java:1307 build/trans_presets.java:1319 +#: build/trans_presets.java:1331 build/trans_presets.java:1343 +#: build/trans_presets.java:1355 build/trans_presets.java:1367 +#: build/trans_presets.java:1379 build/trans_presets.java:1409 msgid "siding" msgstr "侧线" @@ -23941,8 +24007,8 @@ #. item "Transport/Railway/Tram" combo "Types" display value #. item "Transport/Railway/Disused Rail" combo "Optional Types" display value -#: build/trans_presets.java:1308 build/trans_presets.java:1320 -#: build/trans_presets.java:1332 build/trans_presets.java:1344 -#: build/trans_presets.java:1356 build/trans_presets.java:1368 -#: build/trans_presets.java:1380 build/trans_presets.java:1410 +#: build/trans_presets.java:1307 build/trans_presets.java:1319 +#: build/trans_presets.java:1331 build/trans_presets.java:1343 +#: build/trans_presets.java:1355 build/trans_presets.java:1367 +#: build/trans_presets.java:1379 build/trans_presets.java:1409 msgid "spur" msgstr "支线" @@ -23955,8 +24021,8 @@ #. item "Transport/Railway/Subway" combo "Electrified" #. item "Transport/Railway/Tram" combo "Electrified" -#: build/trans_presets.java:1309 build/trans_presets.java:1321 -#: build/trans_presets.java:1333 build/trans_presets.java:1345 -#: build/trans_presets.java:1357 build/trans_presets.java:1369 -#: build/trans_presets.java:1381 +#: build/trans_presets.java:1308 build/trans_presets.java:1320 +#: build/trans_presets.java:1332 build/trans_presets.java:1344 +#: build/trans_presets.java:1356 build/trans_presets.java:1368 +#: build/trans_presets.java:1380 msgid "Electrified" msgstr "电气化" @@ -23969,8 +24035,8 @@ #. item "Transport/Railway/Subway" combo "Electrified" display value #. item "Transport/Railway/Tram" combo "Electrified" display value -#: build/trans_presets.java:1309 build/trans_presets.java:1321 -#: build/trans_presets.java:1333 build/trans_presets.java:1345 -#: build/trans_presets.java:1357 build/trans_presets.java:1369 -#: build/trans_presets.java:1381 +#: build/trans_presets.java:1308 build/trans_presets.java:1320 +#: build/trans_presets.java:1332 build/trans_presets.java:1344 +#: build/trans_presets.java:1356 build/trans_presets.java:1368 +#: build/trans_presets.java:1380 msgid "contact_line" msgstr "接触网" @@ -23999,4 +24065,11 @@ #. #. +#. +#. +#. color rail +#. +#. +#. +#. #. #. color rail @@ -24031,12 +24104,13 @@ #. #. color rail -#: build/trans_presets.java:1309 build/trans_presets.java:1321 -#: build/trans_presets.java:1333 build/trans_presets.java:1345 -#: build/trans_presets.java:1357 build/trans_presets.java:1369 -#: build/trans_presets.java:1381 build/trans_style.java:595 -#: build/trans_style.java:958 build/trans_style.java:1008 -#: build/trans_style.java:1014 build/trans_style.java:1021 -#: build/trans_style.java:1027 build/trans_style.java:1033 -#: build/trans_style.java:1034 build/trans_style.java:1039 +#: build/trans_presets.java:1308 build/trans_presets.java:1320 +#: build/trans_presets.java:1332 build/trans_presets.java:1344 +#: build/trans_presets.java:1356 build/trans_presets.java:1368 +#: build/trans_presets.java:1380 build/trans_style.java:589 +#: build/trans_style.java:952 build/trans_style.java:959 +#: build/trans_style.java:1023 build/trans_style.java:1029 +#: build/trans_style.java:1036 build/trans_style.java:1042 +#: build/trans_style.java:1048 build/trans_style.java:1049 +#: build/trans_style.java:1054 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:76 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:77 @@ -24054,9 +24128,9 @@ #. #. item "Power/Power Line" combo "Voltage" -#: build/trans_presets.java:1310 build/trans_presets.java:1322 -#: build/trans_presets.java:1334 build/trans_presets.java:1346 -#: build/trans_presets.java:1358 build/trans_presets.java:1370 -#: build/trans_presets.java:1382 build/trans_presets.java:1637 -#: build/trans_presets.java:3327 +#: build/trans_presets.java:1309 build/trans_presets.java:1321 +#: build/trans_presets.java:1333 build/trans_presets.java:1345 +#: build/trans_presets.java:1357 build/trans_presets.java:1369 +#: build/trans_presets.java:1381 build/trans_presets.java:1636 +#: build/trans_presets.java:3328 msgid "Voltage" msgstr "电压" @@ -24069,8 +24143,8 @@ #. item "Transport/Railway/Subway" combo "Frequency (Hz)" #. item "Transport/Railway/Tram" combo "Frequency (Hz)" -#: build/trans_presets.java:1311 build/trans_presets.java:1323 -#: build/trans_presets.java:1335 build/trans_presets.java:1347 -#: build/trans_presets.java:1359 build/trans_presets.java:1371 -#: build/trans_presets.java:1383 +#: build/trans_presets.java:1310 build/trans_presets.java:1322 +#: build/trans_presets.java:1334 build/trans_presets.java:1346 +#: build/trans_presets.java:1358 build/trans_presets.java:1370 +#: build/trans_presets.java:1382 msgid "Frequency (Hz)" msgstr "频率(Hz)" @@ -24083,8 +24157,8 @@ #. item "Transport/Railway/Subway" combo "Frequency (Hz)" display value #. item "Transport/Railway/Tram" combo "Frequency (Hz)" display value -#: build/trans_presets.java:1311 build/trans_presets.java:1323 -#: build/trans_presets.java:1335 build/trans_presets.java:1347 -#: build/trans_presets.java:1359 build/trans_presets.java:1371 -#: build/trans_presets.java:1383 +#: build/trans_presets.java:1310 build/trans_presets.java:1322 +#: build/trans_presets.java:1334 build/trans_presets.java:1346 +#: build/trans_presets.java:1358 build/trans_presets.java:1370 +#: build/trans_presets.java:1382 msgid "16.7" msgstr "16.7" @@ -24092,10 +24166,10 @@ #. #. item "Transport/Railway/Narrow Gauge Rail" -#: build/trans_presets.java:1314 +#: build/trans_presets.java:1313 msgid "Narrow Gauge Rail" msgstr "窄轨" #. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail" -#: build/trans_presets.java:1315 +#: build/trans_presets.java:1314 msgid "Edit Narrow Gauge Rail" msgstr "编辑窄轨" @@ -24103,5 +24177,5 @@ #. #. item "Transport/Railway/Monorail" -#: build/trans_presets.java:1326 +#: build/trans_presets.java:1325 msgid "Monorail" msgstr "单轨" @@ -24109,5 +24183,5 @@ #. #. item "Transport/Railway/Monorail" label "Edit Monorail" -#: build/trans_presets.java:1328 +#: build/trans_presets.java:1327 msgid "Edit Monorail" msgstr "编辑单轨" @@ -24115,10 +24189,10 @@ #. #. item "Transport/Railway/Preserved" -#: build/trans_presets.java:1338 +#: build/trans_presets.java:1337 msgid "Preserved" msgstr "保留铁路" #. item "Transport/Railway/Preserved" label "Edit Preserved Railway" -#: build/trans_presets.java:1339 +#: build/trans_presets.java:1338 msgid "Edit Preserved Railway" msgstr "编辑保留的铁路" @@ -24126,10 +24200,10 @@ #. #. item "Transport/Railway/Light Rail" -#: build/trans_presets.java:1350 +#: build/trans_presets.java:1349 msgid "Light Rail" msgstr "轻轨" #. item "Transport/Railway/Light Rail" label "Edit Light Rail" -#: build/trans_presets.java:1351 +#: build/trans_presets.java:1350 msgid "Edit Light Rail" msgstr "编辑轻轨" @@ -24137,10 +24211,10 @@ #. #. item "Transport/Railway/Subway" -#: build/trans_presets.java:1362 +#: build/trans_presets.java:1361 msgid "Subway" msgstr "地铁" #. item "Transport/Railway/Subway" label "Edit Subway" -#: build/trans_presets.java:1363 +#: build/trans_presets.java:1362 msgid "Edit Subway" msgstr "编辑地铁" @@ -24148,10 +24222,10 @@ #. #. item "Transport/Railway/Tram" -#: build/trans_presets.java:1374 +#: build/trans_presets.java:1373 msgid "Tram" msgstr "有轨电车" #. item "Transport/Railway/Tram" label "Edit Tram" -#: build/trans_presets.java:1375 +#: build/trans_presets.java:1374 msgid "Edit Tram" msgstr "编辑有轨电车" @@ -24159,5 +24233,5 @@ #. #. item "Transport/Railway/Bus Guideway" -#: build/trans_presets.java:1386 +#: build/trans_presets.java:1385 msgid "Bus Guideway" msgstr "导轨巴士" @@ -24165,5 +24239,5 @@ #. #. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway" -#: build/trans_presets.java:1388 +#: build/trans_presets.java:1387 msgid "Edit Bus Guideway" msgstr "编辑导轨巴士" @@ -24172,10 +24246,10 @@ #. #. item "Transport/Railway/Disused Rail" -#: build/trans_presets.java:1406 +#: build/trans_presets.java:1405 msgid "Disused Rail" msgstr "不使用的轨道" #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway" -#: build/trans_presets.java:1407 +#: build/trans_presets.java:1406 msgid "Edit Disused Railway" msgstr "编辑不使用的铁路" @@ -24184,10 +24258,10 @@ #. #. item "Transport/Railway/Disused Rail" combo "Optional Types" -#: build/trans_presets.java:1410 +#: build/trans_presets.java:1409 msgid "Optional Types" msgstr "选择性的类型" #. item "Transport/Railway/Abandoned Rail" -#: build/trans_presets.java:1412 +#: build/trans_presets.java:1411 msgid "Abandoned Rail" msgstr "废弃的轨道" @@ -24196,5 +24270,5 @@ #. #. item "Transport/Railway/Level Crossing" -#: build/trans_presets.java:1416 +#: build/trans_presets.java:1415 msgid "Level Crossing" msgstr "铁路平交道" @@ -24203,5 +24277,5 @@ #. #. item "Transport/Railway/Crossing" -#: build/trans_presets.java:1420 +#: build/trans_presets.java:1419 msgid "Crossing" msgstr "平交道" @@ -24211,5 +24285,5 @@ #. #. item "Transport/Railway/Crossing" combo "Crossing type" -#: build/trans_presets.java:1424 +#: build/trans_presets.java:1423 msgid "Crossing type" msgstr "平交道类型" @@ -24217,5 +24291,5 @@ #. #. item "Transport/Railway/Turntable" -#: build/trans_presets.java:1430 +#: build/trans_presets.java:1429 msgid "Turntable" msgstr "调车转盘" @@ -24224,5 +24298,5 @@ #. #. item "Transport/Railway/Buffer Stop" -#: build/trans_presets.java:1434 +#: build/trans_presets.java:1433 msgid "Buffer Stop" msgstr "止冲器" @@ -24231,10 +24305,10 @@ #. #. group "Aerialway" -#: build/trans_presets.java:1439 +#: build/trans_presets.java:1438 msgid "Aerialway" msgstr "空中线路" #. item "Aerialway/Chair Lift" -#: build/trans_presets.java:1440 +#: build/trans_presets.java:1439 msgid "Chair Lift" msgstr "椅式升降机" @@ -24242,5 +24316,5 @@ #. #. item "Aerialway/Chair Lift" label "Edit Chair Lift" -#: build/trans_presets.java:1442 +#: build/trans_presets.java:1441 msgid "Edit Chair Lift" msgstr "编辑椅式升降机" @@ -24262,12 +24336,12 @@ #. item "Facilities/Toilets" text "Reference number" #. item "Vending machine" text "Reference number" -#: build/trans_presets.java:1445 build/trans_presets.java:1459 -#: build/trans_presets.java:1470 build/trans_presets.java:1483 -#: build/trans_presets.java:1496 build/trans_presets.java:1510 -#: build/trans_presets.java:1521 build/trans_presets.java:1532 -#: build/trans_presets.java:1543 build/trans_presets.java:1554 -#: build/trans_presets.java:1564 build/trans_presets.java:1591 -#: build/trans_presets.java:2303 build/trans_presets.java:2313 -#: build/trans_presets.java:2646 build/trans_presets.java:3821 +#: build/trans_presets.java:1444 build/trans_presets.java:1458 +#: build/trans_presets.java:1469 build/trans_presets.java:1482 +#: build/trans_presets.java:1495 build/trans_presets.java:1509 +#: build/trans_presets.java:1520 build/trans_presets.java:1531 +#: build/trans_presets.java:1542 build/trans_presets.java:1553 +#: build/trans_presets.java:1563 build/trans_presets.java:1590 +#: build/trans_presets.java:2304 build/trans_presets.java:2314 +#: build/trans_presets.java:2647 build/trans_presets.java:3822 msgid "Reference number" msgstr "编号" @@ -24293,14 +24367,14 @@ #. #. item "Aerialway/Magic Carpet" text "Number of people per hour" -#: build/trans_presets.java:1447 build/trans_presets.java:1461 -#: build/trans_presets.java:1472 build/trans_presets.java:1485 -#: build/trans_presets.java:1498 build/trans_presets.java:1512 -#: build/trans_presets.java:1523 build/trans_presets.java:1534 -#: build/trans_presets.java:1545 build/trans_presets.java:1556 +#: build/trans_presets.java:1446 build/trans_presets.java:1460 +#: build/trans_presets.java:1471 build/trans_presets.java:1484 +#: build/trans_presets.java:1497 build/trans_presets.java:1511 +#: build/trans_presets.java:1522 build/trans_presets.java:1533 +#: build/trans_presets.java:1544 build/trans_presets.java:1555 msgid "Number of people per hour" msgstr "每小时运量" #. item "Aerialway/Chair Lift" text "Number of people per chair" -#: build/trans_presets.java:1448 +#: build/trans_presets.java:1447 msgid "Number of people per chair" msgstr "每椅子的人数" @@ -24318,10 +24392,10 @@ #. #. item "Aerialway/Goods" text "Typical journey time in minutes" -#: build/trans_presets.java:1449 build/trans_presets.java:1462 -#: build/trans_presets.java:1474 build/trans_presets.java:1487 -#: build/trans_presets.java:1500 build/trans_presets.java:1513 -#: build/trans_presets.java:1524 build/trans_presets.java:1535 -#: build/trans_presets.java:1546 build/trans_presets.java:1557 -#: build/trans_presets.java:1566 +#: build/trans_presets.java:1448 build/trans_presets.java:1461 +#: build/trans_presets.java:1473 build/trans_presets.java:1486 +#: build/trans_presets.java:1499 build/trans_presets.java:1512 +#: build/trans_presets.java:1523 build/trans_presets.java:1534 +#: build/trans_presets.java:1545 build/trans_presets.java:1556 +#: build/trans_presets.java:1565 msgid "Typical journey time in minutes" msgstr "典型行程用时(分钟)" @@ -24329,5 +24403,5 @@ #. item "Aerialway/Chair Lift" check "Has bubble?" #. item "Aerialway/Mixed Lift" check "Has bubble?" -#: build/trans_presets.java:1450 build/trans_presets.java:1501 +#: build/trans_presets.java:1449 build/trans_presets.java:1500 msgid "Has bubble?" msgstr "" @@ -24337,6 +24411,6 @@ #. item "Aerialway/Gondola" check "Has heating?" #. item "Aerialway/Mixed Lift" check "Has heating?" -#: build/trans_presets.java:1451 build/trans_presets.java:1475 -#: build/trans_presets.java:1488 build/trans_presets.java:1502 +#: build/trans_presets.java:1450 build/trans_presets.java:1474 +#: build/trans_presets.java:1487 build/trans_presets.java:1501 msgid "Has heating?" msgstr "有加热吗？" @@ -24344,5 +24418,5 @@ #. #. item "Aerialway/Drag Lift" -#: build/trans_presets.java:1454 +#: build/trans_presets.java:1453 msgid "Drag Lift" msgstr "拖曳升降机" @@ -24350,5 +24424,5 @@ #. #. item "Aerialway/Drag Lift" label "Edit Drag Lift" -#: build/trans_presets.java:1456 +#: build/trans_presets.java:1455 msgid "Edit Drag Lift" msgstr "编辑拖曳升降机" @@ -24356,5 +24430,5 @@ #. #. item "Aerialway/Cable Car" -#: build/trans_presets.java:1465 +#: build/trans_presets.java:1464 msgid "Cable Car" msgstr "缆车" @@ -24362,10 +24436,10 @@ #. #. item "Aerialway/Cable Car" label "Edit Cable Car" -#: build/trans_presets.java:1467 +#: build/trans_presets.java:1466 msgid "Edit Cable Car" msgstr "编辑缆车" #. item "Aerialway/Cable Car" text "Number of people per car" -#: build/trans_presets.java:1473 +#: build/trans_presets.java:1472 msgid "Number of people per car" msgstr "每车的人数" @@ -24373,5 +24447,5 @@ #. #. item "Aerialway/Gondola" -#: build/trans_presets.java:1478 +#: build/trans_presets.java:1477 msgid "Gondola" msgstr "索道" @@ -24379,10 +24453,10 @@ #. #. item "Aerialway/Gondola" label "Edit Gondola" -#: build/trans_presets.java:1480 +#: build/trans_presets.java:1479 msgid "Edit Gondola" msgstr "编辑索道" #. item "Aerialway/Gondola" text "Number of people per gondola" -#: build/trans_presets.java:1486 +#: build/trans_presets.java:1485 msgid "Number of people per gondola" msgstr "每厢的人数" @@ -24390,5 +24464,5 @@ #. #. item "Aerialway/Mixed Lift" -#: build/trans_presets.java:1491 +#: build/trans_presets.java:1490 msgid "Mixed Lift" msgstr "" @@ -24396,10 +24470,10 @@ #. #. item "Aerialway/Mixed Lift" label "Edit Mixed Lift (containing both gondolas and chairs)" -#: build/trans_presets.java:1493 +#: build/trans_presets.java:1492 msgid "Edit Mixed Lift (containing both gondolas and chairs)" msgstr "" #. item "Aerialway/Mixed Lift" text "Number of people per gondola/chair" -#: build/trans_presets.java:1499 +#: build/trans_presets.java:1498 msgid "Number of people per gondola/chair" msgstr "" @@ -24407,5 +24481,5 @@ #. #. item "Aerialway/T-bar Lift" -#: build/trans_presets.java:1505 +#: build/trans_presets.java:1504 msgid "T-bar Lift" msgstr "" @@ -24413,5 +24487,5 @@ #. #. item "Aerialway/T-bar Lift" label "Edit T-bar Lift" -#: build/trans_presets.java:1507 +#: build/trans_presets.java:1506 msgid "Edit T-bar Lift" msgstr "" @@ -24419,5 +24493,5 @@ #. #. item "Aerialway/J-bar Lift" -#: build/trans_presets.java:1516 +#: build/trans_presets.java:1515 msgid "J-bar Lift" msgstr "" @@ -24425,5 +24499,5 @@ #. #. item "Aerialway/J-bar Lift" label "Edit J-bar Lift" -#: build/trans_presets.java:1518 +#: build/trans_presets.java:1517 msgid "Edit J-bar Lift" msgstr "" @@ -24431,5 +24505,5 @@ #. #. item "Aerialway/Platter Lift" -#: build/trans_presets.java:1527 +#: build/trans_presets.java:1526 msgid "Platter Lift" msgstr "" @@ -24437,5 +24511,5 @@ #. #. item "Aerialway/Platter Lift" label "Edit Platter Lift" -#: build/trans_presets.java:1529 +#: build/trans_presets.java:1528 msgid "Edit Platter Lift" msgstr "" @@ -24443,5 +24517,5 @@ #. #. item "Aerialway/Rope Tow" -#: build/trans_presets.java:1538 +#: build/trans_presets.java:1537 msgid "Rope Tow" msgstr "" @@ -24449,5 +24523,5 @@ #. #. item "Aerialway/Rope Tow" label "Edit Rope Tow" -#: build/trans_presets.java:1540 +#: build/trans_presets.java:1539 msgid "Edit Rope Tow" msgstr "" @@ -24455,5 +24529,5 @@ #. #. item "Aerialway/Magic Carpet" -#: build/trans_presets.java:1549 +#: build/trans_presets.java:1548 msgid "Magic Carpet" msgstr "" @@ -24461,5 +24535,5 @@ #. #. item "Aerialway/Magic Carpet" label "Edit Magic Carpet" -#: build/trans_presets.java:1551 +#: build/trans_presets.java:1550 msgid "Edit Magic Carpet" msgstr "" @@ -24467,5 +24541,5 @@ #. #. item "Aerialway/Goods" -#: build/trans_presets.java:1560 +#: build/trans_presets.java:1559 msgctxt "aerialway" msgid "Goods" @@ -24473,5 +24547,5 @@ #. item "Aerialway/Goods" label "Edit Goods" -#: build/trans_presets.java:1561 +#: build/trans_presets.java:1560 msgctxt "aerialway" msgid "Edit Goods" @@ -24481,5 +24555,5 @@ #. #. item "Aerialway/Station" -#: build/trans_presets.java:1570 +#: build/trans_presets.java:1569 msgctxt "aerialway" msgid "Station" @@ -24488,5 +24562,5 @@ #. #. item "Aerialway/Station" label "Edit Station" -#: build/trans_presets.java:1572 +#: build/trans_presets.java:1571 msgctxt "aerialway" msgid "Edit Station" @@ -24494,5 +24568,5 @@ #. item "Aerialway/Pylon" -#: build/trans_presets.java:1576 +#: build/trans_presets.java:1575 msgctxt "aerialway" msgid "Pylon" @@ -24501,5 +24575,5 @@ #. #. item "Aerialway/Pylon" label "Edit Pylon" -#: build/trans_presets.java:1578 +#: build/trans_presets.java:1577 msgctxt "aerialway" msgid "Edit Pylon" @@ -24517,6 +24591,6 @@ #. #. #. #. #. #. #.