Index: /applications/editors/josm/i18n/po/zh_CN.po =================================================================== --- /applications/editors/josm/i18n/po/zh_CN.po (revision 26748) +++ /applications/editors/josm/i18n/po/zh_CN.po (revision 26749) @@ -9,5 +9,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-27 19:09+0200\n" +"POT-Creation-Date: 2011-10-02 14:06+0200\n" "PO-Revision-Date: 2011-08-29 11:39+0000\n" "Last-Translator: mmyfl \n" @@ -18,6 +18,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-09-27 14:54+0000\n" -"X-Generator: Launchpad (build 14041)\n" +"X-Launchpad-Export-Date: 2011-10-02 11:32+0000\n" +"X-Generator: Launchpad (build 14071)\n" #. FIXME why is help not a JosmAction? @@ -92,7 +92,7 @@ #: ../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/plugins/PluginHandler.java:213 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:388 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:212 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:628 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:105 @@ -194,5 +194,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:376 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:375 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:508 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:35 @@ -256,6 +256,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:238 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:817 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:819 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:825 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:827 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:61 msgid "Java OpenStreetMap Editor" @@ -441,6 +441,4 @@ #: ../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 @@ -655,6 +653,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250 #: ../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 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:999 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1029 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:43 #: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:44 @@ -2837,6 +2835,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:179 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:326 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:478 #, java-format msgid "There was {0} conflict during import." @@ -4384,5 +4382,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:167 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:168 msgid "node" msgid_plural "nodes" @@ -4403,6 +4401,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:445 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:630 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:446 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:631 msgid "relation" msgid_plural "relations" @@ -4820,9 +4818,9 @@ "这会测试是否有两条道路、铁路、水路或建筑物在同一图层交错，但没有以节点连接。" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:120 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:123 msgid "Crossing buildings" msgstr "交错的建筑物" -#: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:120 +#: ../core/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java:123 msgid "Crossing ways" msgstr "路径交叉" @@ -5325,5 +5323,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 #: ../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/ChildRelationBrowser.java:178 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137 @@ -5598,5 +5596,5 @@ #. color building #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:102 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:435 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:436 #: build/trans_style.java:3615 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 @@ -5741,7 +5739,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:546 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:120 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:547 #, java-format msgid " [id: {0}]" @@ -5777,8 +5775,8 @@ msgstr "不要再显示(记住选择)" -#: ../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/DefaultNameFormatter.java:136 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:210 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:302 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:312 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:148 msgid "incomplete" @@ -5786,6 +5784,6 @@ #. I18n: name of house as parameter -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:150 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:234 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:151 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:235 #, java-format msgid "House {0}" @@ -5794,6 +5792,6 @@ #. I18n: house number, street as parameter, number should remain #. before street for better visibility -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:241 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:242 #, java-format msgid "House number {0} at {1}" @@ -5801,12 +5799,12 @@ #. I18n: house number as parameter -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:161 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:245 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:162 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:246 #, java-format msgid "House number {0}" msgstr "房屋门牌号码 {0}" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:224 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:600 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:225 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:601 msgid "highway" msgstr "公路" @@ -5814,17 +5812,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:225 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:601 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:602 #: build/trans_presets.java:4332 build/trans_presets.java:4362 msgid "railway" msgstr "铁路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:602 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:227 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:603 msgid "waterway" msgstr "航道" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:227 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:603 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:228 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:604 msgid "landuse" msgstr "土地利用" @@ -5833,6 +5831,6 @@ #. nevertheless, who knows what future brings #. I18n: count of nodes as parameter -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:265 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:608 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:266 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:609 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:456 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:768 @@ -5844,6 +5842,6 @@ msgstr[0] "{0} 节点" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:308 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:658 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:309 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:659 #, java-format msgid "{0} member" @@ -5851,9 +5849,9 @@ msgstr[0] "{0} 成员" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:430 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:431 msgid "public transport" msgstr "公共交通" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:494 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:495 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -7940,5 +7938,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:313 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:440 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:454 #: build/trans_presets.java:591 build/trans_presets.java:650 #: build/trans_presets.java:787 build/trans_presets.java:809 @@ -8203,5 +8201,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:770 #: build/trans_presets.java:4272 msgid "Relations" @@ -8220,5 +8218,5 @@ msgstr "删除选定的关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:347 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:349 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40 @@ -8227,5 +8225,5 @@ msgstr "建立新的关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:384 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441 #: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19 @@ -8233,17 +8231,17 @@ msgstr "建立这个关系的复本，并且在另一个编辑器窗口开启它" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:428 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Add the selected relations to the current selection" msgstr "添加选定的关系到当前的选择范围中" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424 msgid "Set the current selection to the list of selected relations" msgstr "将当前的选择范围设定到选定关系的列表中" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:426 msgid "Select relation (add)" msgstr "选择关系(添加)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:426 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1232 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16 @@ -8251,17 +8249,17 @@ msgstr "选择关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:467 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:462 msgid "Add the members of all selected relations to current selection" msgstr "添加所有选定关系的成员到当前的选择范围中" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:468 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:463 msgid "Select the members of all selected relations" msgstr "选择所有已选定关系的成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:465 msgid "Select members (add)" msgstr "选择成员(添加)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:470 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1263 #: ../plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java:16 @@ -8269,13 +8267,13 @@ msgstr "选择成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:500 msgid "Download all members of the selected relations" msgstr "下载已选定关系的所有成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:501 msgid "Download members" msgstr "下载成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:537 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:532 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:817 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1282 @@ -8283,5 +8281,5 @@ msgstr "下载已选定关系的不完整成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:539 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:534 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:819 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1284 @@ -8289,5 +8287,5 @@ msgstr "下载不完整的成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:773 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 #, java-format msgid "Relations: {0}" @@ -10429,26 +10427,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:175 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:176 msgid "Edit the relation the currently selected relation member refers to." msgstr "编辑目前选定的关系成员所参照的关系。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:219 msgid "Download all child relations (recursively)" msgstr "下载所有子关系(递归式)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download All Children" msgstr "下载所有子项目" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:240 msgid "Download selected relations" msgstr "下载选定的关系" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:244 msgid "Download Selected Children" msgstr "下载选定的子项目" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:288 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:437 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:289 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:443 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:42 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:50 @@ -10457,6 +10455,6 @@ msgstr "下载关系成员" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:481 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1177 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:615 @@ -10465,5 +10463,5 @@ msgstr[0] "数据有冲突" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343 #, java-format msgid "" @@ -10472,16 +10470,16 @@ msgstr "子关系
{0}
已在服务器中删除。它已无法加载" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 msgid "Relation is deleted" msgstr "关系已删除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:399 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:501 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:400 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:507 #, java-format msgid "Downloading relation {0}" msgstr "正在下载关系 {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:418 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:511 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:424 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:517 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 @@ -11245,6 +11243,4 @@ #. 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" @@ -13397,6 +13393,4 @@ #: ../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" @@ -13756,6 +13750,4 @@ #: ../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" @@ -15254,8 +15246,8 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:317 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:339 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:329 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:759 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:928 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:328 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:758 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:927 msgid "Update plugins" msgstr "更新插件" @@ -16428,41 +16420,4 @@ 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 msgid "All Formats" @@ -16693,5 +16648,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:261 +#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:267 msgid "Choose a predefined license" msgstr "选择预定义的授权" @@ -17051,5 +17006,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:84 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:142 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:104 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:143 @@ -17176,5 +17131,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:165 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:87 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:145 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:107 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:146 @@ -17202,5 +17157,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576 #: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:80 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286 @@ -17246,14 +17201,14 @@ msgstr "文件“{0}”不存在" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:57 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:53 #, java-format msgid "No data found in file {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:58 +#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:54 msgid "Open OSM file" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:139 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:170 #, java-format @@ -17265,5 +17220,5 @@ "maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:192 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:216 #, java-format @@ -17271,5 +17226,5 @@ msgstr "删除的路径 {0} 包含节点" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:201 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:150 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:206 @@ -17278,5 +17233,5 @@ msgstr "路径 {1} 的 缺少必要的属性“{0}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:153 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:188 @@ -17286,5 +17241,5 @@ msgstr "元素 的属性“ref”有不合法的数值。得到 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:267 #, java-format @@ -17292,5 +17247,5 @@ msgstr "删除的关系 {0} 包含成员" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:306 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:243 #, java-format @@ -17298,5 +17253,5 @@ msgstr "在关系 {0} 的成员缺少属性 \"ref\"。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:248 #, java-format @@ -17304,5 +17259,5 @@ msgstr "在关系 {0} 的成员属性 \"ref\"有不合法的数值。得到 {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:193 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:252 @@ -17311,5 +17266,5 @@ msgstr "在关系 {1} 的成员 {0} 缺少属性“type”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:320 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:199 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:257 @@ -17319,15 +17274,15 @@ msgstr "在关系 {1} 的成员 {0} 属性“type”有不合法的数值。得到 {2}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:326 #: ../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:301 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:221 msgid "Missing key or value attribute in tag." msgstr "标签中缺少设定键或数值属性。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:226 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:280 @@ -17336,5 +17291,5 @@ msgstr "在输入串流中发现未定义的元素“{0}”。正在跳过。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:425 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:334 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:308 @@ -17342,6 +17297,6 @@ msgstr "不合法的对象，id=0" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394 -#: ../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:455 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:357 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:334 @@ -17354,8 +17309,8 @@ #. default version in 0.5 files for existing primitives -#: ../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 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:457 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:462 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:340 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:345 @@ -17370,5 +17325,5 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:413 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:470 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:353 #, java-format @@ -17376,5 +17331,5 @@ msgstr "不明或不支持的 API 版本。得到 {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:476 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:359 #, java-format @@ -17383,6 +17338,6 @@ #. for a new primitive we just log a warning -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:451 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:461 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:508 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:380 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:388 @@ -17396,6 +17351,6 @@ #. for an existing primitive this is a problem -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:455 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:512 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:522 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:383 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:391 @@ -17406,5 +17361,5 @@ msgstr "属性“changeset”有不合法的数值。得到“{0}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:474 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:304 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:414 @@ -17413,5 +17368,5 @@ msgstr "缺少必要的属性“{0}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:536 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:310 #: ../plugins/reverter/src/reverter/corehacks/MultiOsmReader.java:419 @@ -17420,19 +17375,54 @@ msgstr "属性“{0}”有不合法的 long 数值。得到“{1}”。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:541 -#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:250 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:609 +#: ../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:621 +#: ../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:628 +#: ../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:670 +#: ../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:694 +#: ../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:728 msgid "Prepare OSM data..." msgstr "准备 OSM 数据..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:542 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:729 msgid "Parsing OSM data..." msgstr "正在分析 OSM 数据..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550 -#: ../core/src/org/openstreetmap/josm/io/PbfReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:737 msgid "Preparing data set..." msgstr "正在准备数据集合..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:566 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:761 #: ../plugins/CommandLine/src/CommandLine/OsmToCmd.java:66 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/io/SigReader.java:221 @@ -17586,33 +17576,4 @@ 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 @@ -17755,16 +17716,16 @@ msgstr "插件 {0} 发生错误" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75 msgid "integrated into main program" msgstr "集成到主程序" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:96 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:95 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:107 #, java-format msgid "replaced by new {0} plugin" msgstr "以新的 {0} 插件取代" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:196 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:195 msgid "The following plugin is no longer necessary and has been deactivated:" msgid_plural "" @@ -17772,5 +17733,5 @@ msgstr[0] "下列插件已不再需要，且切换为不使用：" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:231 #, java-format msgid "" @@ -17782,5 +17743,5 @@ "它应该被停用。
是否从首选项中删除？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258 msgid "" "You updated your JOSM software.
To prevent problems the plugins should be " @@ -17790,22 +17751,22 @@ "新？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:275 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:274 #, java-format msgid "Last plugin update more than {0} days ago." msgstr "上次的插件更新已是 {0} 天前。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285 msgid "Click to update the activated plugins" msgstr "点击以更新使用中的插件" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289 msgid "Skip update" msgstr "跳过更新" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291 msgid "Click to skip updating the activated plugins" msgstr "点击以跳过更新使用中的插件" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306 msgid "" "Skipping plugin update after JOSM upgrade. Automatic update at startup is " @@ -17813,5 +17774,5 @@ msgstr "跳过在 JOSM 升级后的插件更新。启动时自动更新已停用。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:308 msgid "" "Skipping plugin update after elapsed update interval. Automatic update at " @@ -17819,5 +17780,5 @@ msgstr "跳过在经过更新时间间隔后的插件更新。启动时自动更新已停用。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:316 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315 msgid "" "Running plugin update after JOSM upgrade. Automatic update at startup is " @@ -17825,5 +17786,5 @@ msgstr "执行在 JOSM 升级后的插件更新。启动时自动更新已启用。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317 msgid "" "Running plugin update after elapsed update interval. Automatic update at " @@ -17831,5 +17792,5 @@ msgstr "执行在经过更新时间间隔后的插件更新。启动时自动更新已启用。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:324 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323 #, java-format msgid "" @@ -17837,5 +17798,5 @@ msgstr "首选项“{1}”有意外的数值“{0}”。推测数值应为“ask”。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:362 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361 #, java-format msgid "" @@ -17846,5 +17807,5 @@ msgstr[0] "找不到插件 {0} 需要的 {1} 插件。缺少的插件为：" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:384 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:383 #, java-format msgid "" @@ -17855,15 +17816,15 @@ "JOSM 才能使用这个插件。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:471 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:470 #, java-format msgid "Could not load plugin {0}. Delete from preferences?" msgstr "无法加载插件 {0}。是否从首选项中删除？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:475 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:474 #, java-format msgid "loading plugin ''{0}'' (version {1})" msgstr "正在加载插件“{0}”(版本 {1})" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:481 #, java-format msgid "" @@ -17874,45 +17835,45 @@ "删除？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:505 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:504 msgid "Loading plugins ..." msgstr "正在加载插件..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:506 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:505 msgid "Checking plugin preconditions..." msgstr "正在检查插件先决条件..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:533 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:532 #, java-format msgid "Loading plugin ''{0}''..." msgstr "正在加载插件“{0}”..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:614 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:613 msgid "JOSM could not find information about the following plugin:" msgid_plural "JOSM could not find information about the following plugins:" msgstr[0] "JOSM 找不到下列插件的相关信息：" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:622 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:621 msgid "The plugin is not going to be loaded." msgid_plural "The plugins are not going to be loaded." msgstr[0] "这个插件将不会被加载。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:648 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:647 msgid "Determine plugins to load..." msgstr "决定要加载的插件..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:654 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:653 msgid "Removing deprecated plugins..." msgstr "正在删除废弃的插件..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:656 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:655 msgid "Removing unmaintained plugins..." msgstr "正在删除停止维护的插件..." -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:680 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:679 msgid "Updating the following plugin has failed:" msgid_plural "Updating the following plugins has failed:" msgstr[0] "更新下列插件失败：" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:691 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:690 msgid "" "Please open the Preference Dialog after JOSM has started and try to update " @@ -17923,42 +17884,42 @@ msgstr[0] "请在 JOSM 启动后开启首选项对话框，并尝试手动更新它们。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:699 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:698 msgid "Plugin update failed" msgstr "插件更新失败" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:735 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:739 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:734 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:738 msgid "Warning: failed to download plugin information list" msgstr "警告：无法下载插件数据列表" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:801 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:816 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:899 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:800 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:815 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:898 msgid "Disable plugin" msgstr "停用插件" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:803 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:802 #, java-format msgid "Click to delete the plugin ''{0}''" msgstr "点击以删除插件“{0}”" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:905 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:806 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:904 msgid "Keep plugin" msgstr "保留插件" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:809 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:907 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:808 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:906 #, java-format msgid "Click to keep the plugin ''{0}''" msgstr "点击以保留插件“{0}”" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:883 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:882 #, java-format msgid "Warning: failed to delete outdated plugin ''{0}''." msgstr "警告：无法删除过时的插件“{0}”" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:884 -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:883 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:889 #, java-format msgid "" @@ -17968,5 +17929,5 @@ "警告：无法安装已下载的插件“{0}”。正在跳过安装。JOSM 仍然会加载旧的插件版本。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:889 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:888 #, java-format msgid "" @@ -17975,10 +17936,10 @@ msgstr "警告：无法从缓存下载文件“{1}”安装插件“{0}”。仍然失败。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900 #, java-format msgid "Click to disable the plugin ''{0}''" msgstr "点击以停用插件“{0}”" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:914 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:913 #, java-format msgid "" @@ -17986,19 +17947,19 @@ msgstr "发生意想不到的异常，可能来自“{0}”插件。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:917 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:916 #, java-format msgid "According to the information within the plugin, the author is {0}." msgstr "根据此插件的信息，作者是 {0}。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:920 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:919 msgid "" "Try updating to the newest version of this plugin before reporting a bug." msgstr "在回复程序错误前，请先尝试将插件升级到最新版本。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:922 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:921 msgid "Should the plugin be disabled?" msgstr "是否停用此插件？" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:999 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:998 msgid "" "The plugin has been removed from the configuration. Please restart JOSM to " @@ -18006,14 +17967,14 @@ msgstr "该插件已从配置中删除。请重新启动 JOSM 以卸载插件。" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1042 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1041 msgid "Plugin information" msgstr "插件信息" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1047 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1046 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:250 msgid "no description available" msgstr "没有描述可用" -#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1079 +#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1078 msgid "" "Do not ask again and remember my decision (go to Preferences->Plugins to " @@ -18407,5 +18368,5 @@ msgstr "
错误信息：{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:420 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:434 #, java-format msgid "" @@ -18419,5 +18380,5 @@ "错字。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:447 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:461 #, java-format msgid "" @@ -18429,5 +18390,5 @@ "首选项中的 API URL 与互联网网络连接。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:519 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:535 #, java-format msgid "" @@ -18441,5 +18402,5 @@ "

错误的信息为：
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:630 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:635 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -41758,117 +41719,80 @@ msgstr "关于插件" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:68 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:68 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:68 msgid "Native password manager plugin" msgstr "本地密码管理器插件" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:207 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:207 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:207 msgid "No native password manager could be found!" msgstr "没有本地密码管理器可以找到！" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:208 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208 -#, fuzzy -msgid "" -"Depending on your Operating Stystem / Distribution, you may have to create a " +#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208 +msgid "" +"Depending on your Operating System / Distribution, you may have to create a " "default keyring / wallet first." msgstr "根据您的操作系统/配置，您可能需要首先创建一个默认的密钥环/钱包。" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:258 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258 -#, fuzzy -msgid "No thanks, use JOSM's plain text preferences storage" +#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258 +msgid "No thanks, use JOSM''s plain text preferences storage" msgstr "不，谢谢，使用 JOSM 的纯文本首选项存储" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:321 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321 -#, fuzzy -msgid "" -"Found sensitive data that is still saved in JOSM's preference file (plain " +#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321 +msgid "" +"Found sensitive data that is still saved in JOSM''s preference file (plain " "text)." msgstr "找到仍然保存在 JOSM 的首选项文件(纯文本)中的敏感数据。" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:323 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323 -msgid "Erase and transfer to password manager" -msgstr "" - -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:324 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324 +#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323 +msgid "Transfer to password manager and remove from preference file" +msgstr "转移到密码管理器，并从首选项文件中删除" + #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:324 msgid "No, just keep it" msgstr "不，就保持它" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:464 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:464 msgid "Close the dialog and discard all changes" msgstr "关闭对话框并放弃所有更改" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:499 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:499 msgid "Proceed and go to the next page" msgstr "继续到下一个页面" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:517 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:517 msgid "Finish" msgstr "完成" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/InitializationWizard.java:519 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:519 msgid "Confirm the setup and close this dialog" msgstr "确认设置并关闭此对话框" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:139 msgid "JOSM/OSM API/Username" msgstr "JOSM/OSM API/用户名" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:140 msgid "JOSM/OSM API/Password" msgstr "JOSM/OSM API/密码" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:144 msgid "JOSM/Proxy/Username" msgstr "JOSM/Proxy/用户名" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:145 msgid "JOSM/Proxy/Password" msgstr "JOSM/Proxy/密码" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:191 msgid "JOSM/OAuth/OSM API/Key" msgstr "JOSM/OAuth/OSM API/键" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:192 msgid "JOSM/OAuth/OSM API/Secret" msgstr "JOSM/OAuth/OSM API/密码" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:211 msgid "Native Password Manager Plugin" msgstr "本地密码管理器插件" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:212 #, java-format @@ -41876,51 +41800,36 @@ msgstr "用户名和密码被 {0} 保护。" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:216 msgid "username" msgstr "用户名" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:219 msgid "password" msgstr "密码" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:222 msgid "proxy username" msgstr "代理用户名" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:225 msgid "proxy password" msgstr "代理密码" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:228 msgid "oauth key" msgstr "oauth 键" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:231 msgid "oauth secret" msgstr "oauth 密码" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234 -#, fuzzy +#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234 +#, java-format msgid "" "
Warning: There may be sensitive data left in your " -"preference file. (" +"preference file. ({0})" msgstr "" "
警告：有可能有敏感数据留在您的首选项设置文件中。({0})" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:245 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:245 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:242 #, java-format @@ -41928,16 +41837,8 @@ msgstr "保存用户名和密码({0})" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:16 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:16 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:16 msgid "Plain text, JOSM default" msgstr "纯文本，JOSM 默认" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:22 -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:28 -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:33 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:22 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:28 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:33 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:22 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:28 @@ -41947,44 +41848,12 @@ msgstr "使用 {0}" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:38 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:38 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:38 msgid "Encrypt data with Windows logon credentials" msgstr "用 Windows 登录凭据加密数据" -#: ../plugins/native-password-manager/src-export/openstreetmap/josm/plugins/npm/NPMType.java:42 -#: ../plugins/native-password-manager/src-quilt/org/openstreetmap/josm/plugins/npm/NPMType.java:42 #: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMType.java:42 #, java-format msgid "The native password manager plugin detected {0} on your system." msgstr "本地密码管理器插件检测到您的系统中有 {0}。" - -#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:208 -msgid "" -"Depending on your Operating System / Distribution, you may have to create a " -"default keyring / wallet first." -msgstr "根据您的操作系统/配置，您可能需要首先创建一个默认的密钥环/钱包。" - -#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:258 -msgid "No thanks, use JOSM''s plain text preferences storage" -msgstr "不，谢谢，使用 JOSM 的纯文本首选项存储" - -#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:321 -msgid "" -"Found sensitive data that is still saved in JOSM''s preference file (plain " -"text)." -msgstr "找到仍然保存在 JOSM 的首选项文件(纯文本)中的敏感数据。" - -#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/InitializationWizard.java:323 -msgid "Transfer to password manager and remove from preference file" -msgstr "转移到密码管理器，并从首选项文件中删除" - -#: ../plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java:234 -#, java-format -msgid "" -"
Warning: There may be sensitive data left in your " -"preference file. ({0})" -msgstr "" -"
警告：有可能有敏感数据留在您的首选项设置文件中。({0})" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52 @@ -45824,190 +45693,2 @@ msgid "Drive a race car on this layer" msgstr "在这个图层驾驶赛车" - -#~ msgid "Info about Element" -#~ msgstr "元素的信息" - -#~ msgid "Object history" -#~ msgstr "对象历史记录" - -#~ msgid "Get detailed information on the internal state of the objects." -#~ msgstr "取得对象内部状态的详细信息。" - -#~ msgid "Inspect" -#~ msgstr "检查" - -#~ msgid "Near" -#~ msgstr "靠近" - -#~ msgctxt "placeselection" -#~ msgid "Zoom" -#~ msgstr "缩放" - -#~ msgid "Overlapping areas" -#~ msgstr "重叠的区域" - -#~ msgid "(deactivated)" -#~ msgstr "(不使用)" - -#~ msgid "Yahoo Sat" -#~ msgstr "Yahoo Sat" - -#~ msgid "TilesAtHome" -#~ msgstr "TilesAtHome" - -#~ msgid "NPE Maps" -#~ msgstr "英国地形测量局新大众版 (NPE) 地图" - -#~ msgid "" -#~ "Warning: Fetching WMS tiles is likely to fail. Please check you " -#~ "preference settings." -#~ msgstr "警告：取回 WMS 拼贴似乎失败了。请检查您的首选项值。" - -#~ msgid "Cannot open {0} file because no suitable file importer is available." -#~ msgid_plural "" -#~ "Cannot open {0} files because no suitable file importer is available." -#~ msgstr[0] "不能打开文件 {0}，因为没有合适的文件处理程序可用。" - -#~ msgid "Display object information about OSM nodes, ways, or relations." -#~ msgstr "显示 OSM 路径、节点或关系的对象信息。" - -#~ msgid "Invalid URL?" -#~ msgstr "无效的 URL？" - -#~ msgid "Yes, fetch images" -#~ msgstr "是，获取图片" - -#~ msgid "Save Access Token to preferences" -#~ msgstr "将访问令牌保存到首选项" - -#~ msgid "Pressure" -#~ msgstr "压强" - -#~ msgid "xx l/min" -#~ msgstr "xx 升/分钟" - -#~ msgid "Node id={0}" -#~ msgstr "节点 id={0}" - -#~ msgid " incomplete\n" -#~ msgstr " 不完整\n" - -#~ msgid "Way id={0}" -#~ msgstr "路径 id={0}" - -#~ msgid " nodes:\n" -#~ msgstr " 节点：\n" - -#~ msgid "Relation id={0}" -#~ msgstr "关系 id={0}" - -#~ msgid " members:\n" -#~ msgstr " 成员：\n" - -#~ msgid " (reversed)" -#~ msgstr " (已反转)" - -#~ msgid " tags:\n" -#~ msgstr " 标签：\n" - -#~ msgid "id: {0}" -#~ msgstr "id：{0}" - -#~ msgid " name: {0}" -#~ msgstr " 名称：{0}" - -#~ msgid " not in data set" -#~ msgstr " 不在数据集合中" - -#~ msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" -#~ msgstr "警告：WMS 图层已停用，因为基础 URL“{0}”出现异常" - -#~ 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 的拼贴" -#~ "吗？" - -#~ msgid "Warning: The complete URL is ''{0}''." -#~ msgstr "警告：完整 URL 为“{0}”。" - -#~ msgid "" -#~ "The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n" -#~ "This may lead to wrong coordinates." -#~ msgstr "" -#~ "URL 中的投影“{0}”与目前的投影“{1}”不符。\n" -#~ "这可能会导致错误的坐标。" - -#~ msgid "Diameter" -#~ msgstr "直径" - -#~ msgid " {0} name: {1}" -#~ msgid_plural " {0} names: {1}" -#~ msgstr[0] " {0} 名称：{1}" - -#~ msgid " lat={0} lon={1} (projected: x={2}, y={3}); " -#~ msgstr " 纬度={0} 经度={1} (投影处：x={2}，y={3})； " - -#~ msgid " {0} node; " -#~ msgid_plural " {0} nodes; " -#~ msgstr[0] " {0} 个节点； " - -#~ msgid " {0} member; " -#~ msgid_plural " {0} members; " -#~ msgstr[0] " {0} 个成员； " - -#~ msgid "" -#~ "Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}; Version: " -#~ "{4}" -#~ msgstr "" -#~ "数据集合：{0}；用户：[{1}]；修改集合 id：{2}；时间戳记：{3}；版本：{4}" - -#~ msgid "; deleted" -#~ msgstr "；已删除" - -#~ msgid "; deleted-on-server" -#~ msgstr "；已在服务器上删除" - -#~ msgid "; modified" -#~ msgstr "；已修改" - -#~ msgid "; filtered/hidden" -#~ msgstr "；已过滤/隐藏" - -#~ msgid "; filtered/disabled" -#~ msgstr "；已过滤/禁用" - -#~ msgid "; has direction keys" -#~ msgstr "；有带方向性的键" - -#~ msgid " way referrer:\n" -#~ msgstr " 被路径参照：\n" - -#~ msgid " relation referrer:\n" -#~ msgstr " 被关系参照：\n" - -#~ msgid "Open Aerial Map" -#~ msgstr "开放航拍图" - -#~ msgid "" -#~ "Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing " -#~ "''&'' or a trailing ''?''." -#~ msgstr "警告：WMS 服务基础 URL“{0}”没有以“&”或“？”结尾。" - -#~ msgid "In conflict with:\n" -#~ msgstr "有冲突：\n" - -#~ msgid "" -#~ "Warning: Could not detect type of imagery source ''{0}''. Using default " -#~ "(xml)." -#~ msgstr "警告：无法检测到图像源“{0}”的类型。正在使用默认(XML)。" - -#~ msgid "Wire Fence" -#~ msgstr "铁丝网" - -#~ msgid "Wood Fence" -#~ msgstr "木围栏"