Changeset 26299 in osm for applications/editors/josm/i18n/po/zh_CN.po

Timestamp:

2011-07-10T23:22:15+02:00 (15 years ago)

Author:

stoecker

Message:

i18n update, update to josm core cleanup

File:

• applications/editors/josm/i18n/po/zh_CN.po (modified) (116 diffs)

applications/editors/josm/i18n/po/zh_CN.po

@@ -9 +9 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-08 20:18+0200\n"
+"POT-Creation-Date: 2011-07-10 22:18+0200\n"
 "PO-Revision-Date: 2011-06-29 03:24+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
@@ -18 +18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-07-08 16:41+0000\n"
+"X-Launchpad-Export-Date: 2011-07-10 16:08+0000\n"
 "X-Generator: Launchpad (build 13376)\n"
 
@@ -73 +73 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:603
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:706
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:619
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:421
@@ -109 +109 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:152
 #: ../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
@@ -182 +183 @@
 #: ../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:1268
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1278
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1270
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1280
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:80
@@ -390 +391 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:317
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1009
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
@@ -414 +415 @@
 #: ../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:1412
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
@@ -525 +526 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1598
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:63
@@ -595 +596 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java:23
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:30
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:28
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:26
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java:26
@@ -635 +637 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:513
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1000
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1030
@@ -849 +851 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:32
-#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:84
+#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:89
 msgid "Create multipolygon"
 msgstr "建立多重多边形"
@@ -877 +879 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:320
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1032
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:741
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:742
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:504
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
@@ -1082 +1084 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:693
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1437
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1460
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:524
 msgid "Duplicate"
@@ -1200 +1202 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:266
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1232
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1350
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
@@ -1296 +1298 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:345
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:694
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:695
 msgid "Please abort if you are not sure"
 msgstr "如果不确定，请放弃"
@@ -1833 +1835 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1598
 msgid "Paste Tags"
 msgstr "粘贴标签"
@@ -1967 +1969 @@
 #: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:241
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1408
@@ -2912 +2914 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:114
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
 #: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
@@ -3601 +3603 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1212
 msgid "Double conflict"
 msgstr "双重冲突"
@@ -4786 +4788 @@
 msgstr "多重多边形成员没有有用的角色"
 
-#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:258
+#: ../core/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java:259
 msgid "Non-Way in multipolygon"
 msgstr "多重多边形内没有路径"
@@ -4875 +4877 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java:138
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:566
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:568
 msgid "<empty>"
 msgstr "<空白>"
@@ -5057 +5059 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:731
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:732
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:466
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
@@ -5102 +5104 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:225
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:747
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:748
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:138
 msgid "Please select the row to delete."
@@ -5785 +5787 @@
 msgstr "如果指定，会重设配置而非读取它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:169
 msgid "Username"
 msgstr "用户名"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:114
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:177
 msgid "Password"
@@ -5958 +5960 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:202
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6350 +6352 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:257
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:434
@@ -6366 +6368 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:117
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:246
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:307
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -6587 +6589 @@
 #: ../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:465
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:466
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:783
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1035
@@ -6882 +6884 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java:46
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
@@ -7188 +7190 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:173
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
@@ -7730 +7732 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:570
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:491
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492
 msgid "Activate"
 msgstr "使用"
@@ -7879 +7881 @@
 
 #. group "Relations"
+#: ../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:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:777
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:778
 #: build/trans_presets.java:4095
 msgid "Relations"
 msgstr "关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../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:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "开启选取的关系编辑器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "删除选取的关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
-#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:355
+#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:349
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:40
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java:109
@@ -7905 +7907 @@
 msgstr "建立新的关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1457
+#: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:19
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "建立这个关系的复本并且在另一个编辑器窗口开启它"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Add the selected relations to the current selection"
 msgstr "添加选定的关系到当前的选择中"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:432
 msgid "Set the current selection to the list of selected relations"
 msgstr "将目前的选择区域设定到选取关系的清单"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
 msgid "Select relation (add)"
 msgstr "选择关系(添加)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1209
 #: ../plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java:16
@@ -7946 +7949 @@
 msgstr "选择成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:507
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:508
 msgid "Download all members of the selected relations"
 msgstr "下载已选取关系的所有成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:509
 msgid "Download members"
 msgstr "下载成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:864
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1259
@@ -7960 +7963 @@
 msgstr "下载已选取关系的不完整成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:541
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:542
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1261
@@ -7966 +7969 @@
 msgstr "下载不完整的成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:776
 #, java-format
 msgid "Relations: {0}"
@@ -8015 +8018 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:500
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:371
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:387
 #: ../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:54
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:56
 msgid "Selection"
 msgstr "选择区域"
@@ -9292 +9295 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:765
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
 #: build/specialmessages.java:70 build/trans_presets.java:116
 #: build/trans_presets.java:154 build/trans_presets.java:196
@@ -9473 +9476 @@
 #: ../plugins/public_transport/src/public_transport/GTFSStopTableModel.java:72
 #: ../plugins/public_transport/src/public_transport/TrackStoplistTableModel.java:22
-#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:333
+#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:338
 msgid "Name"
 msgstr "名称"
@@ -9922 +9925 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:316
 #: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:328
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:630
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:632
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:214
 msgid "<different>"
@@ -10082 +10085 @@
 #: ../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/GenericRelationEditor.java:1170
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:615
 msgid "Conflict in data"
@@ -10143 +10146 @@
 msgstr "({0}/{1})：正在下载关系 \"{2}\" ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
 msgid "Tags and Members"
 msgstr "标签与成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182
 msgid "Parent Relations"
 msgstr "上层关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:175
 msgid "Child Relations"
 msgstr "子关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:312
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329
 msgid "Apply Role:"
 msgstr "应用角色："
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:314
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
 msgid "Enter a role and apply it to the selected relation members"
 msgstr "输入一个角色并将它应用至选取的关系成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -10173 +10176 @@
 "依关系，但是不建议这么做。<br>您要如何处理循环相依关系？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:606
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Remove them, clean up relation"
 msgstr "删除它们，清除关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
 msgid "Ignore them, leave relation as is"
 msgstr "忽略它们，保持关系原貌"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:669
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:685
 #, java-format
 msgid ""
@@ -10192 +10195 @@
 "关系成员？ </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:679
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:695
 msgid "Multiple members referring to same object."
 msgstr "多个成员参照到相同对象。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 #, java-format
 msgid ""
@@ -10206 +10209 @@
 "做。<br>正跳过关系 \"{0}\"。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:738
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:754
 msgid "Add all objects selected in the current dataset before the first member"
 msgstr "将目前数据组合中的所有对象加入到第一个成员之前"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:764
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780
 msgid "Add all objects selected in the current dataset after the last member"
 msgstr "将目前数据组合中的所有对象加入到最后一个成员之后"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:791
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid ""
 "Add all objects selected in the current dataset before the first selected "
@@ -10220 +10223 @@
 msgstr "将目前数据组合中的所有对象加入到第一个选取的成员之前"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:825
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:841
 msgid ""
 "Add all objects selected in the current dataset after the last selected "
@@ -10226 +10229 @@
 msgstr "将目前数据组合中的所有对象加入到最后一个选取的成员之后"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Remove all members referring to one of the selected objects"
 msgstr "删除所有参照到选取对象之一的所有成员"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876
 msgid "Relation Editor: Remove Selected"
 msgstr "关系编辑器：删除已选取的"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
 msgid "Select relation members which refer to objects in the current selection"
 msgstr "选取参照到目前选择区域的关系成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:920
 #, java-format
 msgid ""
@@ -10246 +10249 @@
 msgstr "在目前的选择区域中选择了参照到 {0} 的关系成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:944
 msgid "Select objects for selected relation members"
 msgstr "选择已选取关系成员中的对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
 msgid "Sort the relation members"
 msgstr "排序关系成员"
 
 #. JButton
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:817
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:940
@@ -10262 +10265 @@
 msgstr "排序"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
 msgid "Relation Editor: Sort"
 msgstr "关系编辑器：排序"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
 msgid "Reverse the order of the relation members"
 msgstr "反转关系成员的顺序"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
 msgid "Reverse"
 msgstr "反转"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:974
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990
 msgid "Relation Editor: Reverse"
 msgstr "关系编辑器：反转"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:994
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1010
 msgid "Move the currently selected members up"
 msgstr "将目前选取的成员上移"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:997
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1013
 msgid "Relation Editor: Move Up"
 msgstr "关系编辑器：上移"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1013
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1029
 msgid "Move the currently selected members down"
 msgstr "将目前选取的成员下移"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
 msgid "Relation Editor: Move Down"
 msgstr "关系编辑器：下移"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
 msgid "Remove the currently selected members from this relation"
 msgstr "将目前选取的成员从这个关系中删除"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
 msgid "Relation Editor: Remove"
 msgstr "关系编辑器：删除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
 msgid "Delete the currently edited relation"
 msgstr "删除目前编辑的关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1098
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
 msgid ""
 "One or more members of this new relation have been deleted while the "
@@ -10318 +10321 @@
 "它们已经从关系成员清单删除了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:596
 msgid "Yes, create a conflict and close"
 msgstr "是，建立冲突并关闭"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176
 msgid "Click to create a conflict and close this relation editor"
 msgstr "点击以建立冲突项目，并关闭这个关系编辑器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:602
 msgid "No, continue editing"
 msgstr "否，继续编辑"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1182
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr "点击以返回关系编辑器，并继续关系的编辑"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -10345 +10348 @@
 "续编辑。<br><br>是否要建立冲突并关闭编辑器？ </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628
 #, java-format
@@ -10355 +10358 @@
 "一次。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:642
 msgid "Apply the current updates"
 msgstr "应用目前的更新"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:685
 msgid "Apply the updates and close the dialog"
 msgstr "应用更新并关闭此对话框"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1288
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:739
 msgid "Cancel the updates and close the dialog"
 msgstr "取消更新并关闭此对话框"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305
 msgid "Add an empty tag"
 msgstr "加入空的标签"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Download all incomplete members"
 msgstr "下载所有未完成的成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1297
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Download Members"
 msgstr "下载成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1351
 msgid "Relation Editor: Download Members"
 msgstr "关系编辑器：下载成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348
 msgid "Download selected incomplete members"
 msgstr "下载选取的未完成成员"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1382
 msgid "Sets a role for the selected members"
 msgstr "为选取的成员设定角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1384
 msgid "Apply Role"
 msgstr "应用角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 #, java-format
 msgid "You are setting an empty role on {0} object."
@@ -10406 +10409 @@
 msgstr[0] "您在 {0} 个对象中设定了空的角色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1401
 msgid "This is equal to deleting the roles of these objects."
 msgstr "这样等于删除这些对象的角色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
 msgid "Do you really want to apply the new role?"
 msgstr "您确定要应用新的角色吗？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1405
 msgid "Yes, apply it"
 msgstr "是，应用它"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1406
 msgid "No, do not apply"
 msgstr "否，不应用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
 msgid "Confirm empty role"
 msgstr "确认空白角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1480
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "编辑目前选取关系成员所参照的关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1557
 msgid ""
 "Members from paste buffer cannot be added because they are not included in "
@@ -11666 +11669 @@
 #. 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:765
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
 #: build/trans_presets.java:117 build/trans_presets.java:135
 #: build/trans_presets.java:155 build/trans_presets.java:175
@@ -13935 +13938 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:86
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:563
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
 msgid "Menu Name"
 msgstr "菜单名称"
@@ -13985 +13988 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:204
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:563
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
 msgctxt "layer"
 msgid "Zoom"
@@ -13995 +13998 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:215
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:563
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:564
 msgid "Imagery URL"
 msgstr "图像 URL"
@@ -14502 +14505 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:199
-#, fuzzy
 msgid "Colors points and track segments by direction."
-msgstr "依速度来为点和轨迹区段上色。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
@@ -14676 +14678 @@
 msgstr "偏移书签"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:401
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:402
 msgid "Available default entries:"
 msgstr "可用的预置项目："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:427
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:428
 msgid "Selected entries:"
 msgstr "选择的项目："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:445
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:446
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
 #: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
@@ -14693 +14695 @@
 msgstr "新增"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:446
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:447
 msgid "Add a new WMS/TMS entry by entering the URL"
 msgstr "通过输入网址添加一个新的 WMS/TMS 条目"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:454
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:455
 msgid "Add Imagery URL"
 msgstr "添加图像 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:466
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:467
 msgid "Remove entry"
 msgstr "删除条目"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:493
 msgid "copy selected defaults"
 msgstr "复制选取的默认值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:511
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:512
 msgid "Please select at least one row to copy."
 msgstr "请选择至少一列来复制。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:548
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:549
 msgid "reload defaults"
 msgstr "重新加载默认值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:642
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
 msgid "Menu Name (Default)"
 msgstr "菜单名称 (默认值)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:642
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:643
 msgid "Imagery URL (Default)"
 msgstr "图像 URL (默认值)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:685
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:686
 #, java-format
 msgid "EULA license URL not available: {0}"
 msgstr "EULA 授权 URL 无法使用：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:699
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:700
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
 msgstr "EULA 授权的 URL 格式错误：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:765
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
 msgid "Projection"
 msgstr "投影方法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:765
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
 msgid "Easting"
 msgstr "向东"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:765
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:766
 msgid "Northing"
 msgstr "向北"
@@ -15922 +15924 @@
 msgstr "加入新标签"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:453
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
 #, java-format
 msgid ""
@@ -15932 +15934 @@
 "\" 中的相同"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:458
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:457
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
 #, java-format
 msgid ""
@@ -15942 +15944 @@
 "\"values\" 中的相同"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:937
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:939
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "关于这个功能的更多信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:974
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:976
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明的必需品：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1031
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1033
 msgid "Available roles"
 msgstr "可用的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1034
 msgid "role"
 msgstr "角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1035
 msgid "count"
 msgstr "计次"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1034
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1036
 msgid "elements"
 msgstr "元素"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1049
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1051
 msgid "Optional Attributes:"
 msgstr "额外属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1098
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1100
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "使用群组 \"{1}\" 中的预设组合 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1101
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "使用预设组合 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1150
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1152
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的类型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1219
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1221
 msgid "Preset role element without parent"
 msgstr "预置无父元素的角色元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1227
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1229
 msgid "Preset sub element without parent"
 msgstr "预置无父元素的子元素"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1267
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1269
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -16004 +16006 @@
 msgstr "无法读取标签预设组合来源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1277
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1279
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 时发生错误： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1320
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "类型 {0} 的元件已支持。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1398
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1399
 #: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
@@ -16021 +16023 @@
 msgstr[0] "改变 {0} 个对象"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1401
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1402
 msgid "Nothing selected!"
 msgstr "尚未选择！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1403
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1404
 msgid "Selection unsuitable!"
 msgstr "选择区域不合适！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1412
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1414
 msgid "Apply Preset"
 msgstr "应用预设组合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1413
 msgid "New relation"
 msgstr "新建关系"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1506
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1507
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -16065 +16067 @@
 msgstr "搜索预设组合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:285
 msgid "Show only applicable to selection"
 msgstr "只显示可适用的选项"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:302
 msgid "Search in tags"
 msgstr "搜索关键字"
@@ -16466 +16468 @@
 msgstr "正在从 \"{0}\" 取回关系包"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -16472 +16474 @@
 msgstr "服务器回应代码 404，以每个对象一次要求的方式重新尝试。"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:441
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:442
 #, java-format
 msgid "Downloading {0} object from ''{1}''"
@@ -18078 +18080 @@
 "<br><br>错误的信息为：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:611
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:602
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -18751 +18753 @@
 msgstr "显示 GPX 轨迹的海拔设定和一些统计数据。"
 
+#. Plugin epci-fr
+#: build/trans_plugins.java:35
+msgid "Handling of French EPCIs (boundary=local_authority)"
+msgstr ""
+
 #. Plugin epsg31287
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "sets current projection to EPSG:31287 - Bessel 1841 in Lambert Conformal "
@@ -18759 +18766 @@
 
 #. Plugin ext_tools
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
 msgid "Use external scripts in JOSM"
@@ -18765 +18772 @@
 
 #. Plugin FastDraw
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Fast drawing ways by mouse"
 msgstr "使用鼠标快速绘制路径"
 
 #. Plugin FixAddresses
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Finds and fixes invalid street addresses in a comfortable way."
 msgstr "寻找并以适当的方式来修正无效的街道地址。"
 
 #. Plugin globalsat
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr "在 JOSM 中直接从 Globalsat dg100 数据记录器下载 GPS 点。"
 
 #. Plugin gpxfilter
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid "Allows to filter out unnececary GPS tracks"
 msgstr "允许过滤掉不需要的 GPS 轨迹"
 
 #. Plugin graphview
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Visualizes routing information as a routing graph."
 msgstr "以路线图显示视觉化路线信息。"
 
 #. Plugin imageryadjust
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "WMSPlugin-style imagery adjustment mapmode"
 msgstr "WMSPlugin-样式图片调整地图模式"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -18805 +18812 @@
 
 #. Plugin ImportImagePlugin
-#: build/trans_plugins.java:53 build/trans_plugins.java:55
+#: build/trans_plugins.java:55 build/trans_plugins.java:57
 msgid "Plugin for importing spatial referenced images"
 msgstr "用来导入空间参照图片的外挂程式"
 
 #. Plugin importvec
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Import vector graphics (SVG)"
 msgstr "导入矢量图形(SVG)"
 
 #. Plugin ImproveWayAccuracy
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Can be useful when you are improving accuracy of existing ways. The idea of "
@@ -18823 +18830 @@
 
 #. Plugin irsrectify
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "A helper for IRS satellite adjustment."
 msgstr "IRS 卫星调整协助程序"
 
 #. Plugin junctionchecking
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "creates a channel digraph and checks a subset of channels if it is a "
@@ -18835 +18842 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Helps vectorizing WMS images."
 msgstr "帮助将 WMS 图片矢量化。"
 
 #. Plugin licensechange
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Checks if all users contributing to an object have agreed to the license "
@@ -18847 +18854 @@
 
 #. Plugin livegps
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -18853 +18860 @@
 
 #. Plugin mapdust
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "The MapDust Plug-In shows the MapDust bug reports on       the map. You can "
@@ -18861 +18868 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -18871 +18878 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "为 4 或 5 条路径加入禁止左转"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:79
 msgid "Simply convert an area to a multipolygon."
 msgstr "简单地把区域转换为多重多边形。"
 
 #. Plugin namemanager
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr "允许在任何选取的区域中，一次将所有对象加入属性标签"
 
 #. Plugin nearclick
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -18896 +18903 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid "extended options for editing opening_hours"
 msgstr "扩展 opening_hours 的编辑选项"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid "Imports issues from OpenStreetBugs"
 msgstr "导入 OpenStreetBugs 的议题"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -18912 +18919 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -18918 +18925 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Import PDF file and convert to ways."
 msgstr "导入 PDF 文件并转换为路径。"
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -18931 +18938 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18938 +18945 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑胶外观与感觉。"
 
 #. Plugin proj4j
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:101
 msgid "adds projections from Proj4J"
 msgstr "从 Proj4J 添加投影法"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:103
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -18954 +18961 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:105
 msgid "Relation and multipolygon creating and editing panel."
 msgstr "关系及多重多边形的创建和编辑面板。"
 
 #. Plugin restart
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr "添加 &quot;重启 JOSM&quot; 项目到文件菜单。"
 
 #. Plugin reverter
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:109
 msgid "Plugin for reverting changesets"
 msgstr "还原修改集合的插件"
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:109
+#: build/trans_plugins.java:111
 msgid "Use rgis.spb.ru image as overlay"
 msgstr "使用 rgis.spb.ru 图片做为覆盖"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -18984 +18991 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:115
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18993 +19000 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Provides routing capabilities."
 msgstr "提供路线规划功能。"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -19008 +19015 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:119 build/trans_plugins.java:121
+#: build/trans_plugins.java:121 build/trans_plugins.java:123
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr "建立并编辑 OpenSeaMap 海图"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允许在目前的 gps 位置加入标记/节点。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:125
+#: build/trans_plugins.java:127
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格线中编辑标签的对话框。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:127
+#: build/trans_plugins.java:129
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -19033 +19040 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:131
 msgid "Make terraced houses out of single blocks."
 msgstr "让连栋房屋能超出单一区块。"
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "建立并编辑 OpenSeaMap 海上航标"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -19050 +19057 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:137
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19057 +19064 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Plugin to digital sign OSM-Data"
 msgstr "用来数字签名 OSM-数据的插件"
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -19068 +19075 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19076 +19083 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:145
 msgid "Allows undeleting object from OSM database"
 msgstr "允许从 OSM 数据库中取消删除对象"
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid "Several utilities that make your life easier."
 msgstr "许多让您的生活更轻松的公用程序。"
 
 #. Plugin videomapping
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19096 +19103 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19105 +19112 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下载一整组互相联结的路径"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:153
+#: build/trans_plugins.java:155
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "为从 GPX 文件导入的路点开启搜索功能。"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:155
+#: build/trans_plugins.java:157
 msgid "Select a sequence of non-branching connected ways"
 msgstr "选择一整列无分支的路径"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:157
+#: build/trans_plugins.java:159
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19154 +19161 @@
 #. default: default string to display
 #. delete_if_empty: true/false
-#. use_last_as_default: true/false
+#. use_last_as_default: true/false/force
 #. combo: combo box, with multiple choices and possible to enter free form text
 #. key: key to set
@@ -19170 +19177 @@
 #. default: default string to display
 #. delete_if_empty: true/false
-#. use_last_as_default: true/false
+#. use_last_as_default: true/false/force
 #. multiselect: list of values from which zero or more can be selected
 #. key: key to set
@@ -19189 +19196 @@
 #. default: default string to display
 #. delete_if_empty: true/false
-#. use_last_as_default: true/false
+#. use_last_as_default: true/false/force
 #. check: checkbox
 #. key: key to set
@@ -29550 +29557 @@
 #. item "Power/Power Generator" combo "Source" display value
 #: build/trans_presets.java:3104
-#, fuzzy
 msgid "solar"
-msgstr "远离"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
@@ -29571 +29577 @@
 #. item "Power/Power Generator" combo "Source" display value
 #: build/trans_presets.java:3104
-#, fuzzy
 msgid "waste"
-msgstr "粘贴"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
@@ -29582 +29587 @@
 #. item "Power/Power Generator" combo "Source" display value
 #: build/trans_presets.java:3104
-#, fuzzy
 msgid "geothermal"
-msgstr "其他铁路"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Source" display value
@@ -29593 +29597 @@
 #. item "Power/Power Generator" combo "Method"
 #: build/trans_presets.java:3105
-#, fuzzy
 msgid "Method"
-msgstr "卫理公会教"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
@@ -29604 +29607 @@
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
-#, fuzzy
 msgid "combustion"
-msgstr "通讯"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
-#, fuzzy
 msgid "fission"
-msgstr "修订"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
-#, fuzzy
 msgid "thermal"
-msgstr "其他铁路"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
-#, fuzzy
 msgid "gasification"
-msgstr "验证"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
 #: build/trans_presets.java:3105
-#, fuzzy
 msgid "wind_turbine"
-msgstr "通风"
+msgstr ""
 
 #. item "Power/Power Generator" combo "Method" display value
@@ -35249 +35247 @@
 #. tms[18]:http://{switch:a,b,c}.www.toolserver.org/tiles/bw-mapnik/{zoom}/{x}/{y}.png;;;osm;osm;osm
 #: build/trans_wms.java:8
-#, fuzzy
 msgid "OpenStreetMap (Mapnik B&W)"
-msgstr "OpenStreetMap (Mapnik)"
+msgstr ""
 
 #. tms[17]:http://tile.opencyclemap.org/cycle;;;osm;osm;osm
@@ -35773 +35770 @@
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:22
-#, fuzzy
 msgid "FastDraw configuration"
-msgstr "高级配置"
+msgstr ""
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:29
-#, fuzzy
 msgid "Epsilon multiplier"
-msgstr "快进倍数"
+msgstr ""
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:30
-#, fuzzy
 msgid "Starting Epsilon"
-msgstr "开始 #："
+msgstr ""
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:57
-#, fuzzy
 msgid "FastDraw settings"
-msgstr "代理服务器设定值"
+msgstr ""
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:63
-#, fuzzy
 msgid "Save settings"
-msgstr "设定值"
+msgstr ""
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java:76
-#, fuzzy
 msgid "Can not read settings"
-msgstr "高级设置"
+msgstr ""
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:55
@@ -35830 +35821 @@
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:367
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:487
-#, fuzzy, java-format
+#, java-format
 msgid "Eps={0}, {1} points"
-msgstr "{0} 点"
+msgstr ""
 
 #: ../plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java:445
@@ -37617 +37608 @@
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:224
+#: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
 msgid "Name:"
 msgstr "名称："
@@ -40271 +40262 @@
 
 #. Main.main.undoRedo.add(new ChangeCommand(chosenRelation.get(), r));
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:479
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:480
 #, java-format
 msgid "Change relation member roles to {0}"
 msgstr "将关系成员角色改变为 {0}"
 
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:500
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:501
 msgid "Change multipolygon creation settings"
 msgstr "改变多重多边形建立设定值"
 
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:513
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:514
 msgid "Create administrative boundary relations"
 msgstr "建立行政区界关系"
 
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:514
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:515
 msgid "Add tags boundary and admin_level to boundary relation ways"
 msgstr "为边界关系的路径添加标签 boundary 和 admin_level"
 
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:515
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:516
 msgid "Move area tags from contour to relation"
 msgstr "将区域标签从轮廓移动到关系"
 
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:541
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:542
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:517
+msgid "When moving tags, consider even non-repeating ones"
+msgstr ""
+
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:543
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:544
 msgid "Enter role for selected members"
 msgstr "为选取的成员输入角色"
 
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:542
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:544
 #: ../plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java:35
 #: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:32
@@ -40306 +40301 @@
 msgstr "关系工具箱：{0}"
 
-#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:567
+#: ../plugins/reltoolbox/src/relcontext/RelContextDialog.java:569
 msgid "another..."
 msgstr "另一个..."
@@ -40323 +40318 @@
 msgstr "从选取的对象中建立多重多边形"
 
-#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:322
+#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:78
+#, fuzzy
+msgid "Move tags from ways to relation"
+msgstr "将区域标签从轮廓移动到关系"
+
+#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:327
 msgid "Enter admin level and name for the border relation:"
 msgstr "输入边界关系的行政层级和名称："
 
-#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:326
+#: ../plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java:331
 msgid "Admin level"
 msgstr "行政层级"
@@ -40350 +40350 @@
 msgid "Download referrers for the the chosen relation and its members"
 msgstr "下载选取关系及它的成员的参照"
+
+#: ../plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java:17
+#, fuzzy
+msgid "Duplicate relation"
+msgstr "重复的关系"
 
 #: ../plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java:25
@@ -41362 +41367 @@
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java:183
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java:193
 msgid "Delete turn."
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:129
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:132
 #, java-format
 msgid "{0} lanes are not referenced in any turn-relation."
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:277
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:257
 msgid "Put the ways in order."
 msgstr "将路径依序放置。"
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:365
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:345
 #, java-format
 msgid "Relation references non-existent (regular) lane {0}"
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:371
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:351
 #, java-format
 msgid "Relation references non-existent extra lane {0}"
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:396
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:376
 #, java-format
 msgid "Integer list \"{0}\" contains unexpected values."
@@ -42266 +42271 @@
 msgstr "已拆开关系"
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:42
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:43
 msgid "More tools"
 msgstr "更多工具"
@@ -42319 +42324 @@
 #, java-format
 msgid "Replace geometry for way {0}"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:24
+#, fuzzy
+msgid "Split adjacent ways"
+msgstr "相邻的路径"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:27
+msgid "Split adjacent ways on T-intersections"
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java:68
+msgid ""
+"There are several ways containing one of the splitting nodes. Select ways "
+"participating in this operation."
 msgstr ""
 
@@ -42738 +42758 @@
 msgid "Drive a race car on this layer"
 msgstr "在这个图层驾驶赛车"
-
-#~ msgid "Warning: no preference ''{0}'' found."
-#~ msgstr "警告：找不到首选项 \"{0}\"。"
 
 #~ msgid "Do not show again"
@@ -44383 +44400 @@
 #~ msgid "Warning: unexpected settings conflict"
 #~ msgstr "警告: 未预期的设定值冲突"
+
+#~ msgid "Warning: no preference ''{0}'' found."
+#~ msgstr "警告：找不到首选项 \"{0}\"。"
 
 #~ msgid ""