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

Timestamp:

2011-03-20T22:28:16+01:00 (15 years ago)

Author:

bastik

Message:

i18n update

File:

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

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

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 16:33+0100\n"
-"PO-Revision-Date: 2011-02-19 12:35+0000\n"
+"POT-Creation-Date: 2011-03-20 22:11+0100\n"
+"PO-Revision-Date: 2011-03-07 12:46+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-03-06 15:26+0000\n"
-"X-Generator: Launchpad (build 12515)\n"
+"X-Launchpad-Export-Date: 2011-03-20 17:29+0000\n"
+"X-Generator: Launchpad (build 12617)\n"
 
 #. FIXME why is help not a JosmAction?
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/Main.java:235
+#: ../core/src/org/openstreetmap/josm/Main.java:233
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:358
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -34 +34 @@
 msgstr "帮助(H)"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:475
+#: ../core/src/org/openstreetmap/josm/Main.java:473
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的文件 URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:476
-#: ../core/src/org/openstreetmap/josm/Main.java:509
-#: ../core/src/org/openstreetmap/josm/Main.java:596
+#: ../core/src/org/openstreetmap/josm/Main.java:474
+#: ../core/src/org/openstreetmap/josm/Main.java:507
+#: ../core/src/org/openstreetmap/josm/Main.java:594
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -75 +75 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:663
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
@@ -108 +108 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:508
+#: ../core/src/org/openstreetmap/josm/Main.java:506
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "参数 \"downloadgps\" 不能使用文件名称或文件 URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:595
+#: ../core/src/org/openstreetmap/josm/Main.java:593
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "忽略不正确的 URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:746
+#: ../core/src/org/openstreetmap/josm/Main.java:744
 #, java-format
 msgid ""
@@ -127 +127 @@
 "Java (JRE) 或</li><li>使用较旧版本的 (兼容 Java 5)  JOSM。</li></ul>更多信息:"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:761
+#: ../core/src/org/openstreetmap/josm/Main.java:759
 msgid "Exit JOSM"
 msgstr "退出 JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:762
+#: ../core/src/org/openstreetmap/josm/Main.java:760
 msgid "Continue, try anyway"
 msgstr "强制继续"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:763
+#: ../core/src/org/openstreetmap/josm/Main.java:761
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
@@ -154 +154 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:837
 #: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535
@@ -193 +194 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:969
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:88
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:146
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:156
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:143
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:153
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:141
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:151
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:146
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:159
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:147
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java:89
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:148
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteAddBug.java:158
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:147
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCloseBug.java:159
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:142
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteCommentBug.java:154
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:152
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteInvalidateBug.java:165
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:148
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteReOpenBug.java:160
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:111
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:153
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:205
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java:112
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugDetailsPanel.java:164
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustBugPropertiesPanel.java:227
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/component/panel/MapdustHelpPanel.java:87
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
@@ -223 +224 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
+#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:108
+#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:116
 msgid "About"
 msgstr "关于"
@@ -307 +310 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM primitive will probably fail. API base URL is: ''{0}''"
+"page for OSM object will probably fail. API base URL is: ''{0}''"
 msgstr ""
 "警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 主网站的信息或历史记录页面"
@@ -412 +415 @@
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java:25
 #: ../plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java:103
+#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:445
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:490
@@ -492 +496 @@
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
@@ -579 +583 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:215
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
@@ -621 +625 @@
 msgstr "请选择至少3个节点."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:70
 msgid "data"
 msgstr "数据"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34
 msgid "layer"
 msgstr "图层"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
 msgid "selection"
 msgstr "选择"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
 msgid "conflict"
 msgstr "冲突"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "download"
 msgstr "下载"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "previous"
 msgstr "上一个"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:39
 msgid "next"
 msgstr "下一个"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214
 msgid "Nothing selected to zoom to."
 msgstr "没有选择缩放对象."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122
 #, java-format
 msgid "Zoom to {0}"
 msgstr "缩放到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "将视图缩放至 {0} 。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:122
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
@@ -675 +679 @@
 msgstr "查看: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:214
 msgid "No conflicts to zoom to"
 msgstr "没有冲突可以缩放"
@@ -971 +975 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
-msgid "Download primitives referring to one of the selected primitives"
+#, fuzzy
+msgid "Download objects referring to one of the selected objects"
 msgstr "下载参照到已选取原型中之一的原型"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:695
@@ -982 +987 @@
 msgstr "制作副本"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "制作副本会复制选择区域并立即粘贴上。"
@@ -1088 +1093 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
@@ -1123 +1128 @@
 "If you want to save the offset as bookmark, enter the bookmark name below"
 msgstr ""
+"使用方向键或用鼠标拖曳图片图层来调整图片偏移。\n"
+"您也可以在 {0} 坐标中输入东方和北方的偏移。\n"
+"如果您想要将偏移保存为书签，请在下面输入书签名称"
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:165
@@ -1303 +1311 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
 msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "您也可以粘贴上 www.openstreetmap.org 的网址"
+msgstr "您也可以粘贴上来自 www.openstreetmap.org 的网址"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
@@ -1361 +1369 @@
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:109
 msgid "Custom WMS Link"
-msgstr "自定义 WMS 连结"
+msgstr "自定义 WMS 连接"
 
 #: ../core/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java:116
@@ -1438 +1446 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-msgid "Merge the currently selected primitives into another layer"
+#, fuzzy
+msgid "Merge the currently selected objects into another layer"
 msgstr "将目前选取的原型合并到另一个图层"
 
@@ -1706 +1715 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156
-msgid ""
-"The copied data contains incomplete primitives.  When pasting the incomplete "
-"primitives are removed.  Do you want to paste the data without the "
-"incomplete primitives?"
+#, fuzzy
+msgid ""
+"The copied data contains incomplete objects.  When pasting the incomplete "
+"objects are removed.  Do you want to paste the data without the incomplete "
+"objects?"
 msgstr ""
 "复制的资料含有不完整的原型。当粘贴的时候不完整的原型会被移除。您确定要粘贴含"
@@ -1731 +1741 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:256
-#, java-format
-msgid "to {0} primitive"
-msgid_plural "to {0} primtives"
-msgstr[0] "到 {0} 个原型"
+#, fuzzy, java-format
+msgid "to {0} object"
+msgid_plural "to {0} objects"
+msgstr[0] "删除 {0} 个对象"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
@@ -1847 +1857 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:325
+#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:462
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:248
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
@@ -2752 +2763 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:312
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:361
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:180
@@ -2758 +2769 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
 msgid "Select"
@@ -3371 +3383 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+#, fuzzy, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>This "
 "conflict cannot be added.</html>"
 msgstr ""
@@ -3385 +3397 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"primitive ''{1}''."
+"object ''{1}''."
 msgstr "警告：图层 \"{0}\" 已不存在。不能删除原型 \"{1}\" 的冲突。"
 
@@ -3586 +3598 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65
-#, java-format
-msgid "Undelete {0} primitive"
-msgid_plural "Undelete {0} primitives"
-msgstr[0] "取消删除 {0} 个原型"
+#, fuzzy, java-format
+msgid "Undelete {0} object"
+msgid_plural "Undelete {0} objects"
+msgstr[0] "删除 {0} 个对象"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38
@@ -3886 +3898 @@
 msgstr "不在缓存中"
 
-#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:70
+#: ../core/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java:76
 #, java-format
 msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
@@ -3944 +3956 @@
 msgstr "缺少 id {1} 类型 {0} 的合并目标"
 
-#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. Same version, but different "visible" attribute and neither of them are modified.
+#. It indicates a serious problem in datasets.
 #. For example, datasets can be fetched from different OSM servers or badly hand-modified.
 #. We shouldn't merge that datasets.
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:315
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:316
 #, java-format
 msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
@@ -4096 +4109 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "background"
 msgstr "背景"
@@ -4119 +4132 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg3008.java:29
 msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)"
-msgstr ""
+msgstr "SWEREF99 13 30 / EPSG:3008 (瑞典)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
@@ -4216 +4229 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java:23
 msgid "LKS-92 (Latvia TM)"
-msgstr ""
+msgstr "LKS-92 (拉脱维亚 TM)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:64
@@ -4389 +4402 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:197
 msgid "Duplicate nodes in two un-closed ways"
-msgstr ""
+msgstr "两个未封闭路径有重复的节点"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:208
@@ -4795 +4808 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
@@ -4807 +4820 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:30
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
 msgid "Edit"
@@ -5264 +5278 @@
 #, java-format
 msgid "House number {0} at {1}"
-msgstr ""
+msgstr "房屋门牌号码 {0} 于 {1}"
 
 #. I18n: house number as parameter
@@ -5302 +5316 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
 #, java-format
 msgid "{0} node"
@@ -5417 +5431 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 msgid "Imagery"
 msgstr "图像(I)"
@@ -5658 +5672 @@
 msgstr "首选项 {0} 已经被删除，因为它已不再使用了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -5664 +5678 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
 #: build/specialmessages.java:87
 msgid "View"
 msgstr "查看(V)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26
@@ -5675 +5689 @@
 msgstr "工具(T)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -5681 +5695 @@
 msgstr "预设组合(P)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -5690 +5704 @@
 msgstr "菜单: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:345
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344
 msgid "Audio"
 msgstr "音效(A)"
@@ -5776 +5790 @@
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
 "this list with the mouse.<hr>"
-msgstr "按鼠标中键可以进行循环。<br>按住CTRL 可以用鼠标直接从清单中选择。<hr>"
+msgstr "按鼠标中键可以进行循环。<br>按住 CTRL 可以用鼠标直接从清单中选择。<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:327
@@ -6082 +6096 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
-msgid ""
-"The following primitives could not be copied to the target "
-"primitive<br>because they are deleted in the target dataset:"
+#, fuzzy
+msgid ""
+"The following objects could not be copied to the target object<br>because "
+"they are deleted in the target dataset:"
 msgstr "下列原型无法复制到目标原型，<br>因为它们已经在目标数据组合中被删除了："
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
-msgid "Merging deleted primitives failed"
+#, fuzzy
+msgid "Merging deleted objects failed"
 msgstr "合并删除的原型失败"
 
@@ -6338 +6354 @@
 msgstr "参照于："
 
+#.
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:120
 msgid "(none)"
 msgstr "(没有)"
@@ -6379 +6397 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26
 msgid "Primitive"
 msgstr "原型"
@@ -6610 +6627 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
 #, java-format
 msgid "{0} way"
@@ -6619 +6636 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442
 #, java-format
 msgid "{0} relation"
@@ -6812 +6829 @@
 msgstr "开启所有命令的清单(恢复缓冲区)。"
 
-#. create MapDust GUI
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:116
@@ -6821 +6837 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
@@ -6827 +6843 @@
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:117
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:116
+#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java:188
@@ -6858 +6875 @@
 msgstr "冲突：{0} 未调解"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
 msgid "Resolve"
 msgstr "调解"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:342
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "开启上列清单所有选取的项目的合并对话框。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:362
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115
@@ -7213 +7230 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:48
 msgid "Map Paint Styles"
-msgstr "地图绘制样式"
+msgstr "地图样式"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87
@@ -7278 +7295 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:605
 msgid "Title:"
-msgstr ""
+msgstr "标题:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:607
@@ -7286 +7303 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609
 msgid "Built-in Style, internal path:"
-msgstr ""
+msgstr "内建样式，内部路径:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
@@ -7294 +7311 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:614
 msgid "Icon:"
-msgstr ""
+msgstr "图标:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:617
 msgid "Background:"
-msgstr ""
+msgstr "背景:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619
@@ -7455 +7472 @@
 msgstr "点击以最小化/最大化面板内容"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:73
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:164
 msgid "Authors"
 msgstr "作者"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:71
 msgid "Open a list of people working on the selected objects."
 msgstr "开启在编辑选取对象的用户的清单。"
@@ -7472 +7489 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181
-msgid "Select primitives submitted by this user"
+#, fuzzy
+msgid "Select objects submitted by this user"
 msgstr "选择由这个用户提交的原型"
 
@@ -7505 +7523 @@
 "agreed to the new contributor terms will show a green check mark."
 msgstr ""
+"从服务器载入有关更新授权的信息。已同意使用新贡献者条款的用户会显示绿勾标记。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:322
@@ -7538 +7557 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:119
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43
 msgid "Fix"
 msgstr "修正"
@@ -7759 +7779 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
-msgid "Download and show the history of the selected primitives"
+#, fuzzy
+msgid "Download and show the history of the selected objects"
 msgstr "下载并显示选取原型的历史记录"
 
@@ -7793 +7814 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
-msgid "Zoom to the corresponding primitives in the current data layer"
+#, fuzzy
+msgid "Zoom to the corresponding objects in the current data layer"
 msgstr "缩放到目前数据图层对应的原型"
 
@@ -8925 +8947 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417
-msgid ""
-"Zoom to the primitives in the content of this changeset in the current data "
+#, fuzzy
+msgid ""
+"Zoom to the objects in the content of this changeset in the current data "
 "layer"
 msgstr "缩放到目前数据图层这个修改集合的内容的原型"
@@ -9410 +9433 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
-msgid "Launch browser with wiki help to selected object"
-msgstr "在浏览器中启动选定对象的维基帮助页"
+msgid "Launch browser with wiki help for selected object"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154
@@ -9461 +9484 @@
 msgid ""
 "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-"loaded"
-msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法载入"
+"loaded</html>"
+msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法载入</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353
@@ -9546 +9569 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"object ''{0}''<br><br>Do you really want to add another relation member?</"
 "html>"
 msgstr ""
@@ -9556 +9579 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:681
-msgid "Multiple members referring to same primitive"
+#, fuzzy
+msgid "Multiple members referring to same object."
 msgstr "多个成员参照到同一原型"
 
@@ -9570 +9594 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
-msgid ""
-"Add all primitives selected in the current dataset before the first member"
+#, fuzzy
+msgid "Add all objects selected in the current dataset before the first member"
 msgstr "将目前数据组合中选取的所有原型加到第一个成员之前"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:766
-msgid ""
-"Add all primitives selected in the current dataset after the last member"
+#, fuzzy
+msgid "Add all objects selected in the current dataset after the last member"
 msgstr "将目前数据组合中选取的所有原型加到最后一个成员之后"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
-msgid ""
-"Add all primitives selected in the current dataset before the first selected "
+#, fuzzy
+msgid ""
+"Add all objects selected in the current dataset before the first selected "
 "member"
 msgstr "将目前数据组合中选取的所有原型加到第一个选取的成员之前"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
-msgid ""
-"Add all primitives selected in the current dataset after the last selected "
+#, fuzzy
+msgid ""
+"Add all objects selected in the current dataset after the last selected "
 "member"
 msgstr "将目前数据组合中选取的所有原型加到最后一个选取的成员之后"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859
-msgid "Remove all members referring to one of the selected primitives"
+#, fuzzy
+msgid "Remove all members referring to one of the selected objects"
 msgstr "删除所有参照到选取原型其中之一的成员"
 
@@ -9602 +9629 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:896
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:908
-msgid ""
-"Select relation members which refer to primitives in the current selection"
+#, fuzzy
+msgid "Select relation members which refer to objects in the current selection"
 msgstr "选取参照到目前选取范围的关系成员"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#, java-format
-msgid ""
-"Select relation members which refer to {0} primitives in the current "
-"selection"
+#, fuzzy, java-format
+msgid ""
+"Select relation members which refer to {0} objects in the current selection"
 msgstr "选取参照到目前选取范围{0} 原型的关系成员"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
-msgid "Select primitives for selected relation members"
+#, fuzzy
+msgid "Select objects for selected relation members"
 msgstr "选择已选取关系成员的原型"
 
@@ -9709 +9736 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
-msgstr ""
-"<html>图层 \"{0}\" 已经有冲突于原型<br>\"{1}\"。<br>请先调解这个冲突，然后再"
-"试一次。</html>\""
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
+"resolve this conflict first, then try again.</html>"
+msgstr ""
+"html>图层 \"{0}\" 已经有冲突于对象<br>\"{1}\"。<br>请先调解这个冲突，然后再试"
+"一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
@@ -9763 +9791 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383
-#, java-format
-msgid "You are setting an empty role on {0} primitive."
-msgid_plural "You are setting an empty role on {0} primitives."
+#, fuzzy, java-format
+msgid "You are setting an empty role on {0} object."
+msgid_plural "You are setting an empty role on {0} objects."
 msgstr[0] "您正在设定{0} 个原型的空白角色。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1386
-msgid "This is equal to deleting the roles of these primitives."
+#, fuzzy
+msgid "This is equal to deleting the roles of these objects."
 msgstr "这样等同删除这些原型的角色。"
 
@@ -10047 +10076 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395
-msgid "Click do download the currently selected area"
-msgstr "点击以下载目前选取的区域"
+msgid "Click to download the currently selected area"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402
@@ -10058 +10087 @@
 msgid ""
 "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
-msgstr ""
-"<html>不论<strong>{0}</strong> 或 <strong>{1}</strong> 都没有启用。<br>请选择"
-"下载 OSM 数据，或 GPX 数据，或两个都选。</html>"
+"<br>Please choose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
@@ -10142 +10169 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:441
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/StreetTableModel.java:27
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
 #: build/specialmessages.java:82 build/trans_presets.java:457
 #: build/trans_presets.java:753 build/trans_presets.java:762
@@ -10224 +10252 @@
 msgstr "JOSM 帮助文件浏览器"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
+#. i18n: do not translate "warning-header" and "warning-body"
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:234
 #, java-format
 msgid ""
@@ -10230 +10259 @@
 "class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
 "is not available yet. It is missing both in your local language ({1}) and in "
-"english.<br><br>Please help to improve the JOSM help system and fill in the "
+"English.<br><br>Please help to improve the JOSM help system and fill in the "
 "missing information. You can both edit the <a href=\"{2}\">help topic in "
-"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in English</"
 "a>.</p></html>"
 msgstr ""
-"<html><p class=\"warning-header\">缺少帮助主题的内容</p><p class=\"warning-"
-"body\">帮助主题的内容 <strong>{0}</strong> 尚不能取得。不管是您当地语言 "
-"({1}) 或是英语版本都没有。<br><br>请帮助改进 JOSM 帮助系统并填好缺少的信息。"
-"您可以编辑<a href=\"{2}\">将帮助主题编辑为当地的语言 ({1})</a> 和 <a href="
-"\"{3}\">英语版本</a>。</p></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:256
 #, java-format
 msgid ""
@@ -10253 +10277 @@
 "<br><tt>{1}</tt></p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:356
 #, java-format
 msgid ""
@@ -10262 +10286 @@
 "的互联网网络连接</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
 msgid "Failed to open URL"
 msgstr "无法开启 URL"
 
 #. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:394
 msgid "Open the current help page in an external browser"
 msgstr "在外部浏览器开启目前的帮助页面"
 
 #. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
 msgid "Edit the current help page"
 msgstr "编辑目前的说明页面"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:416
 #, java-format
 msgid ""
@@ -10286 +10310 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:438
 msgid "Reload the current help page"
 msgstr "重新载入目前的说明页面"
 
 #. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:453
 msgid "Go to the previous page"
 msgstr "回到上一页"
 
 #. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
 msgid "Go to the next page"
 msgstr "前往下一页"
 
 #. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:489
 msgid "Go to the JOSM help home page"
 msgstr "转到 JOSM 帮助首页"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:520
 #, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
 msgstr "警告：在HTML 文件中有错误的位置。例外为：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570
 msgid "Failed to open help page. The target URL is empty."
 msgstr "无法开启帮助页面。目标URL 是空的。"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:571
 msgid "Failed to open help page"
 msgstr "无法开启说明页面"
@@ -10424 +10448 @@
 msgid "Relation {0}"
 msgstr "关系 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26
+#, fuzzy
+msgid "Object"
+msgstr "对象"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
@@ -10539 +10568 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:363
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
 msgid "Conflicts detected"
 msgstr "选取的冲突"
@@ -11190 +11219 @@
 #.
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr "警告：原型 \"{0}\" 已在服务器上删除了。正跳过这个原型并尝试重新上传。"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+"警告：对象 \"{0}\" 已经在服务器端被删除了。现在跳过这个对象并重新尝试上传。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
-msgid "Preparing primitives to upload ..."
+#, fuzzy
+msgid "Preparing objects to upload ..."
 msgstr "正在准备要上传的原型 ..."
 
@@ -11338 +11370 @@
 msgstr "修改集合已满"
 
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
-#, java-format
-msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
-msgstr ""
-"警告：对象 \"{0}\" 已经在服务器端被删除了。现在跳过这个对象并重新尝试上传。"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
 #, java-format
@@ -11354 +11376 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:462
 #, java-format
 msgid "Uploading {0} object..."
@@ -11546 +11568 @@
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:158
 #: ../plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/ProjectionProj4J.java:319
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
 #: build/trans_presets.java:4130
 msgid "Description"
@@ -11622 +11645 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:553
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
@@ -11837 +11860 @@
 msgstr "错误"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:119
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120
 #, java-format
 msgid "Data Layer {0}"
 msgstr "数据图层 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181
 msgid "outside downloaded area"
 msgstr "超出下载的区域"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281
 #, java-format
 msgid "version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告：混合 0.6 和 0.5 数据会成为 0.5 版"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355
 #, java-format
 msgid "There was {0} conflict detected."
@@ -11861 +11884 @@
 msgstr[0] "检测到 {0} 个冲突。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
 msgid "Click to close this dialog and continue editing"
 msgstr "按这里关闭这个对话框并继续编辑"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:422
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:427
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
 #, java-format
 msgid "{0} deleted"
@@ -11873 +11896 @@
 msgstr[0] "{0} 已删除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} 组成："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451
 msgid "unset"
 msgstr "取消设定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451
 #, java-format
 msgid "API version: {0}"
 msgstr "API 版本： {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:550
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "转换为 GPX 图层"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648
 msgid "Dataset consistency test"
 msgstr "数据组合一致性测试"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:654
 msgid "No problems found"
 msgstr "没有发现问题"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657
 msgid "Following problems found:"
 msgstr "发现下列问题："
@@ -12048 +12071 @@
 "tiles anyway?"
 msgstr ""
-"<html>这个 WMS 图层的基础 URL<br>\"{0}\"<br>的结尾不能是 \"&\" 或 \"?\" 。"
+"<html>这个 WMS 图层的基础 URL <br>\"{0}\"<br> 的结尾不能是 \"&\" 或 \"?\" 。"
 "<br>这可能会导致无效的 WMS 要求。您应该检查您的<br>首选项值。<br>是否要强制取"
 "回 WMS 拼贴?\""
@@ -12620 +12643 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:175
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:54
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:76
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77
 #, java-format
 msgid ""
@@ -12643 +12666 @@
 "加载这种样式时发生了 {0} 个错误。查看详细信息，请从右键菜单中选择\"信息\"。"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:58
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:62
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:84
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85
 #, java-format
 msgid "Warning: failed to parse Mappaint styles from ''{0}''. Error was: {1}"
@@ -12658 +12681 @@
 msgstr "非法的虚线模式，至少有一个值必须 > 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:80
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:81
 #, java-format
 msgid ""
@@ -13607 +13630 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:131
 #: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
 msgid "None"
 msgstr "没有"
@@ -13721 +13745 @@
 msgstr "快速绘制(看起来较丑)"
 
-#. only interesting directions
+#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr "只提示重要的方向(例如单行道标签)。"
-
-#. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:250
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only on the head of a way."
 msgstr "只在路径的开头。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+msgid "Draw oneway arrows."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
@@ -13876 +13898 @@
 msgstr "GPS 点"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "绘出路径区段的方向提示。"
 
+#. draw oneway arrows
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+msgid "Draw arrows in the direction of oneways and other directed features."
+msgstr ""
+
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:256
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw the order numbers of all segments within their way."
 msgstr "绘出所有区段在其路径中的顺序编号。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地图查看应用平滑化以产生较平滑的外观。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:262
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "绘出从服务器下载数据的边界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:267
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "为了容易修改路径在选择模式中绘出虚拟节点。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:272
 msgid "Draw the inactive data layers in a different color."
 msgstr "将未使用的数据图层以不同的颜色绘制。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:278
 msgid ""
 "This option suppresses the filling of areas, overriding anything specified "
@@ -13911 +13938 @@
 msgstr "这个选项会防止填满区域，并且会覆盖在选取样式中指定的任何数值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:288
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:284
 msgid "OSM Data"
 msgstr "OSM 数据"
@@ -13985 +14012 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:232
 msgid "Add to slippymap chooser: "
-msgstr "加入 slippymap 选择器r: "
+msgstr "加入 slippymap 选择器: "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:236
@@ -14256 +14283 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244
 msgid "JOSM Internal Style"
-msgstr ""
+msgstr "JOSM 内部样式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245
@@ -14264 +14291 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:249
 msgid "Potlatch 2"
-msgstr ""
+msgstr "Potlatch 2"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:250
 msgid "the main Potlatch 2 style"
-msgstr ""
+msgstr "Potlatch 2 的主样式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
@@ -14890 +14917 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:332
 msgid "The default preset for JOSM"
-msgstr ""
+msgstr "JOSM 的预设组合"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
@@ -15199 +15226 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:164
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:42
 msgid "Validate"
 msgstr "检验"
@@ -15351 +15379 @@
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
-msgstr ""
+msgstr "使用群组 \"{1}\" 中的预设组合 \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1069
 #, java-format
 msgid "Use preset ''{0}''"
-msgstr ""
+msgstr "使用预设组合 \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1120
@@ -15838 +15866 @@
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423
+#, fuzzy
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
-"for each primitive."
+"for each object."
 msgstr "服务器传回代码 404，以每个原型个别要求的方式重试。"
 
@@ -15891 +15920 @@
 msgstr "首选项 \"{0}\" 遗失。不能初始化 OsmApi。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr "这个版本的 JOSM 与设定的服务器。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
 #, java-format
 msgid ""
@@ -15902 +15931 @@
 msgstr "它支持通讯协议版本 0.6，但服务器说它支持 {0} 到 {1} 版。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
 msgstr "使用 {1} 版协议建立与 {0} 的连接"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:198
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:203
 #, java-format
 msgid "Removed layer {0} because it is not allowed by the configured API."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+msgstr "已删除图层 {0}，因为它不被配置的 API 所支持。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:291
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:355
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "服务器返回未预期的 id 格式，取得 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
 #, java-format
 msgid ""
@@ -15924 +15953 @@
 msgstr "已修改原型 \"{0}\" 的新版本有未预期的格式。得到 \"{1}\"。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
 msgid "Creating changeset..."
 msgstr "正在建立修改集合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:357
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "成功的开放修改集合 {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:694
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:421
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:704
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
 msgstr "预期修改集合 ID > 0 。得到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:378
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:383
 msgid "Updating changeset..."
 msgstr "正在更新修改集合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "正在更新修改集合 {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423
 msgid "Closing changeset..."
 msgstr "正在关闭修改集合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
 msgid "No changeset present for diff upload."
 msgstr "没有需要进行差异上传的修改集合。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:453
 msgid "Preparing upload request..."
 msgstr "正在准备上传要求..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:478
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:483
 msgid "Waiting 10 seconds ... "
 msgstr "等待 10 秒... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:486
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "{2} 秒内开始重试 {1} 次中的第 {0} 次 ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:489
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:494
 msgid "OK - trying again."
 msgstr "OK - 再试一次。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:570
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:580
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "开始重试 {1} 次中的第 {0} 次。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:666
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:676
 msgid "Current changeset is null. Cannot upload data."
 msgstr "目前的修改集合为 null。不能上传数据。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:668
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:678
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "目前的修改集合 ID 必须大于 0。目前的 ID 是 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:696
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:706
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -17043 +17072 @@
 #, java-format
 msgid "<b>Plugin provided by an external source:</b> {0}"
-msgstr ""
+msgstr "<b>插件由外部来源提供:</b> {0}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42
@@ -17595 +17624 @@
 msgstr "错误发生于列 "
 
-#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:389
+#: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390
 msgid "Missing audio file"
 msgstr "丢失的音频文件"
@@ -18128 +18157 @@
 "Tries to guess address data by picking the name of the closest object with "
 "according tag."
-msgstr ""
+msgstr "尝试通过最近对象中的相关标签，来猜测出地址数据。"
 
 #. Launch address guessing thread
@@ -19535 +19564 @@
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:40
 msgid "Contour Merge"
-msgstr ""
+msgstr "轮廓合并"
 
 #. name
@@ -19541 +19570 @@
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:42
 msgid "Merge the contour of an area with the contour of another area"
-msgstr ""
+msgstr "将区域的轮廓与另一个区域的轮廓合并"
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:153
 msgid "Drag/drop: drag the way segment an drop it on a target segment"
-msgstr ""
+msgstr "拖/放：拖曳路径区段并将它放到目标区段上"
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:159
 msgid "Left-Click: deselect node"
-msgstr ""
+msgstr "左击: 取消选取节点"
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:163
@@ -19563 +19592 @@
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:221
 msgid "Drag the way segment and drop it on a target segment"
-msgstr ""
+msgstr "拖曳路径区段并将它放到目标区段上"
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:229
 msgid "Drop to align to the the target segment"
-msgstr ""
+msgstr "拖放以对齐目标区段"
 
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:258
@@ -19573 +19602 @@
 msgstr "左击: 选择/取消选择节点; 拖动: 拖动路径片段"
 
-#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:416
+#: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java:415
 msgid "Merging Contour"
-msgstr ""
+msgstr "合并轮廓"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:40
@@ -19601 +19630 @@
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Coordinates imported: "
-msgstr "输入的坐标： "
+msgstr "输入的坐标: "
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "Format errors: "
-msgstr "格式错误： "
+msgstr "格式错误: "
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
@@ -19720 +19749 @@
 #, java-format
 msgid "exttool:{0}"
-msgstr ""
+msgstr "外部工具:{0}"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtToolAction.java:24
 #, java-format
 msgid "External Tool: {0}"
-msgstr ""
+msgstr "外部工具: {0}"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
@@ -19828 +19857 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:135
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:136
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:33
 #: build/specialmessages.java:73
 msgid "Refresh"
@@ -20064 +20094 @@
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:68
 msgid "this layer is no osm data layer"
-msgstr ""
+msgstr "这个图层是不是 OSM 数据图层"
 
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java:81
@@ -20202 +20232 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
-msgstr "开始的位置不在 bbox 内"
+msgstr "开始的位置不在限定窗口内"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
@@ -20522 +20552 @@
 msgstr "LiveGPS"
 
-#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:118
+#: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:126
 msgid "Open MapDust"
 msgstr "打开 MapDust"
@@ -20624 +20654 @@
 msgstr "选取的路径中之一已经是另一个多重多边形的一部分。"
 
+#: ../plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java:109
+msgid "About Plugin"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
 msgid "OpenStreetBugs download loop"
@@ -20818 +20852 @@
 msgstr "Firefox 可执行文件"
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:106
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142
 msgid "Transform error: Min X must be smaller than max"
 msgstr "变形错误: 最小 X 必须小于最大值"
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:110
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:146
 msgid "Transform error: Min Y must be smaller than max"
 msgstr "变形错误: 最小 Y 必须小于最大值"
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:116
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:152
 msgid "Transform error: Points too close"
 msgstr "变形错误: 点太过靠近"
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:129
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:142
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:165
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:178
 msgid "Transform error: Unsupported variant."
 msgstr "变形错误: 不支持的变体。"
 
-#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:190
+#: ../plugins/pdfimport/src/pdfimport/FilePlacement.java:226
 msgid "Transform error: Unsupported orientation"
 msgstr "变形错误: 不支持的方向"
@@ -20845 +20879 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:238
 msgid "Select projection..."
-msgstr ""
+msgstr "选择投影方法..."
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:243
@@ -20930 +20964 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:361
 msgid "Bottom left (min) corner:"
-msgstr ""
+msgstr "左下(最小)角:"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:363
@@ -20948 +20982 @@
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:431
 msgid "Projection Preferences"
-msgstr ""
+msgstr "投影方法首选项"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:478
 msgid "Close the dialog and apply projection preferences"
-msgstr ""
+msgstr "关闭对话框，并应用更改投影方法首选项"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:491
 msgid "Close the dialog, discard projection preference changes"
-msgstr ""
+msgstr "关闭对话框，并取消更改投影方法首选项"
 
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:544
@@ -21471 +21505 @@
 msgid "Waypoints"
 msgstr "路标"
+
+#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:36
+#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:38
+#, fuzzy
+msgid "Open Relation Editor"
+msgstr "关系编辑器：排序"
+
+#: ../plugins/relcontext/src/relcontext/RelContextDialog.java:37
+msgid "Opens advanced relation/multipolygon editor panel"
+msgstr ""
 
 #: ../plugins/restart/src/josmrestartplugin/RestartJosmAction.java:17
@@ -21753 +21797 @@
 #, java-format
 msgid "The script file ''{0}'' isn''t readable."
-msgstr ""
+msgstr "脚本文件 \"{0}\" 不可读取"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:237
@@ -21762 +21806 @@
 #, java-format
 msgid "Failed to read the script from the file ''{0}''."
-msgstr "从文件 “{0}\" 中读取脚本失败。"
+msgstr "从文件 \"{0}\" 中读取脚本失败。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:247
@@ -21771 +21815 @@
 #, java-format
 msgid "Failed to read a macro from the file ''{0}''."
-msgstr "从文件 “{0}\" 中读取宏失败。"
+msgstr "从文件 \"{0}\" 中读取宏失败。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:258
@@ -21791 +21835 @@
 "to install a scripting engine with JOSM.</p>"
 msgstr ""
+"<p>脚本不能执行，因为目前没有安装脚本引擎。</p><p>请参考在线帮助，以了解如何"
+"在 JOSM 安装脚本引擎的信息。 </p>"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:277
 msgid "No script engine"
-msgstr ""
+msgstr "没有脚本引擎"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:346
@@ -21810 +21856 @@
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:56
 msgid "Warning: failed to load mime types from file ''0''."
-msgstr ""
+msgstr "警告: 无法从文件 \"{0}\" 中载入 MIME 类型。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:65
 msgid "Warning: failed to load default mime types from  resource ''0''."
-msgstr ""
+msgstr "警告: 无法从来源 \"{0}\" 中载入默认 MIME 类型。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:94
@@ -21831 +21877 @@
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:35
 msgid "Scripting"
-msgstr ""
+msgstr "脚本"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:21
 msgid "Configure..."
-msgstr ""
+msgstr "设定..."
 
 #. title
@@ -21841 +21887 @@
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:23
 msgid "Configure scripting preferences"
-msgstr ""
+msgstr "设定脚本首选项"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:28
 msgid "Script engines"
-msgstr ""
+msgstr "脚本引擎"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:34
 msgid "Configure script engines and scripts"
-msgstr ""
+msgstr "设定脚本引擎和脚本"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:32
 #, java-format
 msgid "''{0}'' doesn''t exist."
-msgstr ""
+msgstr "\"{0}\" 不存在。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:37
 #, java-format
 msgid "''{0}'' is a directory. Expecting a jar file instead."
-msgstr ""
+msgstr "\"{0}\" 是一个目录。预期应该是一个 jar 档案。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:41
 #, java-format
 msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-msgstr ""
+msgstr "\"{0}\" 不可读。不能从这个文件载入脚本引擎。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:48
@@ -21871 +21917 @@
 "Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
 "this file"
-msgstr ""
+msgstr "无法将文件 \"{0}\" 作为 jar 文件打开。不能从这个档案载入脚本引擎"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:53
@@ -21878 +21924 @@
 "The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' is "
 "missing."
-msgstr ""
+msgstr "jar 文件 \"{0}\" 不能提供脚本引擎。缺少项目 \"{1}\"。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:80
 msgid "JAR files"
-msgstr ""
+msgstr "JAR 文件"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:89
 msgid "Enter additional JAR files which provide script engines."
-msgstr ""
+msgstr "输入提供脚本引擎的额外 JAR 文件。"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:135
 msgid "Available script engines"
-msgstr ""
+msgstr "可用的脚本引擎"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:143
 msgid "JOSM currently supports the following script engines:"
-msgstr ""
+msgstr "JOSM 目前支持下列脚本引擎:"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:203
 msgid "JAR file"
-msgstr ""
+msgstr "JAR 文件"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:285
 msgid "Remove the selected jar files"
-msgstr ""
+msgstr "移除选取的 jar 文件"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:309
 msgid "Add a jar file providing a script engine"
-msgstr ""
+msgstr "添加提供脚本引擎的 jar 文件"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:393
 msgid "Launch file chooser"
-msgstr ""
+msgstr "执行文件选取器"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:404
 msgid "Select a jar file"
-msgstr ""
+msgstr "选择一个 jar 文件"
 
 #: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:26
@@ -22312 +22358 @@
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "KeyID"
-msgstr ""
+msgstr "KeyID"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
 msgid "OSM-Info"
-msgstr ""
+msgstr "OSM-信息"
 
 #: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java:39
@@ -22615 +22661 @@
 msgstr ""
 
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:31
+msgid "Edit turn relations and lane lengths for selected node."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:43
+msgid "Validate turn- and lane-length-relations for consistency."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68
+msgid "Turn Lanes"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java:68
+msgid "Edit turn lanes"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:30
+msgid "Quick-Fix"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:34
+msgid "Revalidate all turnlanes-relations."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:43
+msgid "Automatically fixes the issue."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:58
+msgid "Selects the offending relation."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135
+#, java-format
+msgid "{0} lanes are not referenced in any turn-relation."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279
+msgid "Put the ways in order."
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372
+#, java-format
+msgid "Relation references non-existent (regular) lane {0}"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378
+#, java-format
+msgid "Relation references non-existent extra lane {0}"
+msgstr ""
+
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399
+#, java-format
+msgid "Integer list \"{0}\" contains unexpected values."
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:39
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:112
@@ -22812 +22914 @@
 "<html>这个转弯限制已经在编辑器之外被改变了。<br>您不能应用您的修改并继续编"
 "辑。<br><br>您是否要建立一个冲突并关闭这个编辑器?</html>"
-
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:628
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
-"resolve this conflict first, then try again.</html>"
-msgstr ""
-"html>图层 \"{0}\" 已经有冲突于对象<br>\"{1}\"。<br>请先调解这个冲突，然后再试"
-"一次。</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:634
@@ -23380 +23473 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
 msgid "A way is required instead."
-msgstr ""
+msgstr "需要路径代替。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
@@ -23454 +23547 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:49
 msgid "Select Way Nodes"
-msgstr ""
+msgstr "选择路径节点"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SelectWayNodesAction.java:48
 msgid "Select all nodes of a selected way."
-msgstr ""
+msgstr "选择选取路径的所有节点。"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split Object"
-msgstr ""
+msgstr "分割对象"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:43
 msgid "Split an object at the selected nodes."
-msgstr ""
+msgstr "将对象在选取的节点分割。"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:64
@@ -23474 +23567 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:140
 msgid "The selected way is not closed."
-msgstr ""
+msgstr "选取的路径尚未封闭。"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:149
@@ -23927 +24020 @@
 msgctxt "Place type"
 msgid "city"
-msgstr ""
+msgstr "市"
 
 #. relation place type
@@ -23933 +24026 @@
 msgctxt "Place type"
 msgid "locality"
-msgstr ""
+msgstr "地区"
 
 #. relation place type
@@ -23939 +24032 @@
 msgctxt "Place type"
 msgid "village"
-msgstr ""
+msgstr "村"
 
 #. relation place type
@@ -23945 +24038 @@
 msgctxt "Place type"
 msgid "town"
-msgstr ""
+msgstr "镇"
 
 #. relation place type
@@ -23951 +24044 @@
 msgctxt "Place type"
 msgid "borough"
-msgstr ""
+msgstr "镇区"
 
 #. relation place type
@@ -23963 +24056 @@
 msgctxt "Place type"
 msgid "island"
-msgstr ""
+msgstr "岛"
 
 #. relation place type
@@ -23981 +24074 @@
 msgctxt "Place type"
 msgid "suburb"
-msgstr ""
+msgstr "郊区"
 
 #. Strings in JFileChooser
@@ -24250 +24343 @@
 #: build/trans_plugins.java:16
 msgid "Merges the contours of two areas"
-msgstr ""
+msgstr "合并两个区域的轮廓"
 
 #. Plugin Create_grid_of_ways
@@ -24296 +24389 @@
 #: build/trans_plugins.java:32
 msgid "Shows the elevation profile and some statistical data of a GPX track."
-msgstr ""
+msgstr "显示 GPX 轨迹的海拔设定和一些统计资料。"
 
 #. Plugin epsg31287
@@ -24308 +24401 @@
 #: build/trans_plugins.java:38
 msgid "Finds and fixes invalid street addresses in a comfortable way."
-msgstr ""
+msgstr "寻找并以适当的方式来修正无效的街道地址。"
 
 #. Plugin globalsat
@@ -24318 +24411 @@
 #: build/trans_plugins.java:42
 msgid "Allows to filter out unnececary GPS tracks"
-msgstr ""
+msgstr "允许过滤掉不需要的 GPS 轨迹"
 
 #. Plugin graphview
@@ -24328 +24421 @@
 #: build/trans_plugins.java:46
 msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
+msgstr "WMSPlugin-样式图片调整地图模式"
 
 #. Plugin ImageWayPoint
@@ -24394 +24487 @@
 msgstr "简单地把区域转换为多重多边形。"
 
+#. Plugin namemanager
+#: build/trans_plugins.java:71
+msgid "Allows to attribute tags to all objects in any selected area at once"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -24405 +24503 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "extended options for editing opening_hours"
 msgstr "扩展 opening_hours 的编辑选项"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid "Imports issues from OpenStreetBugs"
 msgstr "导入 OpenStreetBugs 的议题"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:79
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -24421 +24519 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:81
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -24427 +24525 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:83
 msgid "Import PDF file and convert to ways."
 msgstr "导入 PDF 文件并转换为路径。"
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:85
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -24440 +24538 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:87
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -24447 +24545 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑胶外观与感觉。"
 
 #. Plugin proj4j
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "adds projections from Proj4J"
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -24463 +24561 @@
 
 #. Plugin restart
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
-msgstr ""
+msgstr "添加 &quot;重新启动 JOSM&quot; 项目到文件菜单。"
 
 #. Plugin reverter
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid "Plugin for reverting changesets"
 msgstr "还原修改集合的插件"
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:99
 msgid "Use rgis.spb.ru image as overlay"
 msgstr "使用 rgis.spb.ru 图片做为覆盖"
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:101
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -24488 +24586 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:103
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -24497 +24595 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:105
 msgid "Provides routing capabilities."
 msgstr "提供路线规画的功能。"
 
 #. Plugin scripting
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:107
 msgid "Allows to run scripts in JOSM."
-msgstr ""
+msgstr "允许在 JOSM 中执行脚本。"
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:109
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -24517 +24615 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:109 build/trans_plugins.java:111
+#: build/trans_plugins.java:111 build/trans_plugins.java:113
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr "建立并编辑 OpenSeaMap 海图"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:113
+#: build/trans_plugins.java:115
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允许在目前的 gps 位置加入标记/节点。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:115
+#: build/trans_plugins.java:117
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格线中编辑标签的对话框。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -24542 +24640 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:121
 msgid "Make terraced houses out of single blocks."
 msgstr "让连栋房屋能超出单一区块。"
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:123
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr "建立并编辑 OpenSeaMap 海上航标"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -24559 +24657 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:125
+#: build/trans_plugins.java:127
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -24566 +24664 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:127
+#: build/trans_plugins.java:129
 msgid "Plugin to digital sign OSM-Data"
+msgstr "用来数字签名OSM-数据的插件"
+
+#. Plugin turnlanes
+#: build/trans_plugins.java:131
+msgid ""
+"Provides a straightforward GUI for adding, editing and deleting turn lanes."
 msgstr ""
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:133
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -24579 +24683 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:135
 msgid "Allows undeleting object from OSM database"
-msgstr "允许从 OSM 数据库中取消删除的对象"
+msgstr "允许从 OSM 数据库中取消删除对象"
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:137
 msgid "Several utilities that make your life easier."
-msgstr ""
+msgstr "许多让您的生活更轻松的公用程序。"
 
 #. Plugin videomapping
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:139
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -24599 +24703 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:141
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -24608 +24712 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:143
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下载一整组互相联结的路径"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:145
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr "为从 GPX 文件导入的路点开启搜索功能。"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:147
 msgid "Select a sequence of non-branching connected ways"
 msgstr "选择一整列无分支的路径"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:149
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
 "behind."
-msgstr "在航照图上将一辆赛车从 A 点开到 B 点，不管 cacti。"
+msgstr "在航拍图上将一辆赛车从 A 点开到 B 点，不管后面的仙人掌。"
 
 #. <?xml version="1.0" encoding="UTF-8"?>
@@ -26552 +26656 @@
 #: build/trans_presets.java:441
 msgid "Min. speed (km/h)"
-msgstr "最低限速 (km/h)"
+msgstr "最低速度 (km/h)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
@@ -26558 +26662 @@
 #: build/trans_presets.java:442 build/trans_presets.java:482
 msgid "Max. weight (tonnes)"
-msgstr "总重限制 (吨)"
+msgstr "最大重量 (吨)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:443
 msgid "Max. axleload (tonnes)"
-msgstr ""
+msgstr "最大轴重 (吨)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:444
 msgid "Max. Height (meters)"
-msgstr "高度限制 (米)"
+msgstr "最高高度 (米)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:445
 msgid "Max. Width (meters)"
-msgstr "宽度限制 (米)"
+msgstr "最大宽度 (米)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #: build/trans_presets.java:446
 msgid "Max. Length (meters)"
-msgstr "长度限制 (米)"
+msgstr "最长长度 (米)"
 
 #. <separator/>
@@ -26792 +26896 @@
 #: build/trans_presets.java:477
 msgid "viaduct"
-msgstr ""
+msgstr "旱桥"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
 #: build/trans_presets.java:477
 msgid "swing"
-msgstr ""
+msgstr "吊桥"
 
 #. item "Highways/Streets/Bridge" combo "Bridge" display value
 #: build/trans_presets.java:477
 msgid "aqueduct"
-msgstr ""
+msgstr "渠桥"
 
 #. item "Highways/Streets/Tunnel" label "Edit Tunnel"
@@ -26884 +26988 @@
 #: build/trans_presets.java:534
 msgid "T1 - hiking trail"
-msgstr ""
+msgstr "T1 - 步道"
 
 #. item "Ways/Path" combo "SAC Scale" display value
 #: build/trans_presets.java:534
 msgid "T2 - mountain hiking trail"
-msgstr ""
+msgstr "T2 - 登山步道"
 
 #. item "Ways/Path" combo "SAC Scale" display value
 #: build/trans_presets.java:534
 msgid "T3 - difficult, exposed hiking trail"
-msgstr ""
+msgstr "T3 - 艰难，裸露步道"
 
 #. item "Ways/Path" combo "SAC Scale" display value
 #: build/trans_presets.java:534
 msgid "T4 - difficult, exposed, steep alpine trail"
-msgstr ""
+msgstr "T4 - 艰难，裸露，陡峭的高山步道"
 
 #. item "Ways/Path" combo "SAC Scale" display value
 #: build/trans_presets.java:534
 msgid "T5 - difficult alpine trail with climbing"
-msgstr ""
+msgstr "T5 - 艰难的攀登高山步道"
 
 #. item "Ways/Path" combo "SAC Scale" display value
 #: build/trans_presets.java:534
 msgid "T6 - hazardous alpine trail with climbing"
-msgstr ""
+msgstr "T6 - 危险的攀登高山步道"
 
 #. item "Ways/Path" combo "SAC Scale" item "T1 - hiking trail" short description
 #: build/trans_presets.java:535
 msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
-msgstr ""
+msgstr "步道清理的很好。地面平坦或略有倾斜，没有摔伤的危险"
 
 #. item "Ways/Path" combo "SAC Scale" item "T2 - mountain hiking trail" short description
@@ -26966 +27070 @@
 #: build/trans_presets.java:543 build/trans_presets.java:2714
 msgid "intermediate"
-msgstr "中级"
+msgstr "中等"
 
 #. item "Ways/Path" combo "Visibility" display value
 #: build/trans_presets.java:543
 msgid "bad"
-msgstr "差"
+msgstr "较差"
 
 #. item "Ways/Path" combo "Visibility" display value
@@ -40043 +40147 @@
 msgstr "测试"
 
+#. JOSM TagChecker validator file
+#. Format:
+#. Each line specifies a certain error to be reported
+#. <data type> : messagetype : <key><expression><value>
+#.
+#. Data type can be:
+#. node        - a node point
+#. way         - a way
+#. relation    - a relation
+#. *           - all data types
+#.
+#. Message type can be:
+#. E            - an error
+#. W            - a warning
+#. I            - an low priority informational warning
+#.
+#. Key and value are expressions describing certain keys and values of these keys.
+#. Regulator expressions are supported. In this case the expressions starts and
+#. ends with // signs. If an 'i' is appended, the regular expression is
+#. case insensitive.
+#.
+#. The * sign indicates any string.
+#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
+#. handling for boolean values (yes, true, 0, false, no, ...).
+#.
+#. Expression can be:
+#. !=          - the key/value combination does not match
+#. ==          - the key/value combination does match
+#.
+#. To have more complicated expressions, multiple elements can be grouped together
+#. with an logical and (&&).
+#.
+#. The comment at the end of a rule is displayed in validator description
+#.
+#. Empty lines and space signs are ignored
+#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
+#: build/trans_validator.java:38
+msgid "abbreviated street name"
+msgstr "缩写的街道名称"
+
+#. node : W : oneway == *
+#: build/trans_validator.java:40
+msgid "oneway tag on a node"
+msgstr "节点上有单行道标签"
+
+#. node : W : bridge == BOOLEAN_TRUE
+#: build/trans_validator.java:41
+msgid "bridge tag on a node"
+msgstr "节点上有桥梁标签"
+
+#. node : W : highway == tertiary
+#. node : W : highway == secondary
+#. node : W : highway == residential
+#. node : W : highway == unclassified
+#. node : W : highway == track
+#: build/trans_validator.java:42 build/trans_validator.java:43
+#: build/trans_validator.java:44 build/trans_validator.java:45
+#: build/trans_validator.java:46
+msgid "wrong highway tag on a node"
+msgstr "节点上错误的公路标签"
+
+#. way  : I : highway == unclassified && name != *
+#: build/trans_validator.java:47
+msgid "Unnamed unclassified highway"
+msgstr "未标名的未分类道路"
+
+#. way  : I : highway == secondary && ref != *
+#. way  : I : highway == tertiary && ref != *
+#. way  : I : highway == motorway && nat_ref != *
+#: build/trans_validator.java:48 build/trans_validator.java:49
+#: build/trans_validator.java:50
+msgid "highway without a reference"
+msgstr "没有编号的公路"
+
+#. *    : W : highway == road
+#: build/trans_validator.java:51
+msgid "temporary highway type"
+msgstr "临时公路标签"
+
+#. *    : W : / *name
+#: build/trans_validator.java:52
+msgid "misspelled key name"
+msgstr "拼错的键名"
+
+#. The following could replace unnamed way check. Still at the moment we keep it as it is
+#. way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
+#. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
+#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
+#: build/trans_validator.java:58
+msgid "cycleway with tag bicycle"
+msgstr "带有标签 bicycle 的自行车道"
+
+#. way  : W : highway == footway && foot == BOOLEAN_FALSE
+#: build/trans_validator.java:59
+msgid "footway with tag foot"
+msgstr "带有标签 foot 的步道"
+
+#. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
+#. way  : I : highway == footway && foot == *                     # footway with tag foot
+#. way  : W : highway == cycleway && cycleway == lane
+#: build/trans_validator.java:62
+msgid "separate cycleway as lane on a cycleway"
+msgstr ""
+
+#. way  : W : highway == * && barrier == *
+#: build/trans_validator.java:63
+msgid "barrier used on a way"
+msgstr "用于路径的障碍物"
+
+#. way  : I : waterway == * && layer != *                         # waterway without layer tag
+#. way  : I : highway == footway && maxspeed == *
+#. way  : I : highway == steps && maxspeed == *
+#: build/trans_validator.java:66 build/trans_validator.java:67
+msgid "maxspeed used for footway"
+msgstr "用于步道的限速标签"
+
+#. *    : W : layer == /\+.
+#: build/trans_validator.java:69
+msgid "layer tag with + sign"
+msgstr "有 + 号的图层标签"
+
+#. *    : I : name == /.*Strasse.
+#: build/trans_validator.java:71
+msgid "street name contains ss"
+msgstr "街道名称包含 ss"
+
+#. relation : E : type != *
+#: build/trans_validator.java:73
+msgid "relation without type"
+msgstr "没有类型的关系"
+
+#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
+#: build/trans_validator.java:75
+msgid "restaurant without name"
+msgstr "没有名称的餐馆"
+
+#. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
+#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : highway == * && waterway == *
+#. *    : W : highway == * && natural == *
+#: build/trans_validator.java:78 build/trans_validator.java:79
+msgid "unusual tag combination"
+msgstr "不常见的标签组合"
+
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
+#: build/trans_wms.java:1
+msgid "Landsat"
+msgstr "Landsat"
+
+#. http://irs.gis-lab.info/?layers=landsat&
+#: build/trans_wms.java:2
+msgid "Landsat (mirror)"
+msgstr "Landsat (镜像)"
+
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
+#: build/trans_wms.java:3
+msgid "Open Aerial Map"
+msgstr "开放航空图"
+
+#. bing:bing
+#: build/trans_wms.java:4
+msgid "Bing Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
+#: build/trans_wms.java:5
+msgid "Yahoo Sat"
+msgstr "Yahoo Sat"
+
+#. tms:http://oatile1.mqcdn.com/naip/{zoom}/{x}/{y}.png
+#: build/trans_wms.java:6
+msgid "MapQuest Open Aerial"
+msgstr ""
+
+#. tms:http://tile.openstreetmap.org/
+#: build/trans_wms.java:7
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap"
+
+#. tms:http://tile.opencyclemap.org/cycle
+#: build/trans_wms.java:8
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
+
+#. tms:http://tah.openstreetmap.org/Tiles/tile
+#: build/trans_wms.java:9
+msgid "TilesAtHome"
+msgstr "TilesAtHome"
+
+#. tms:http://tile.xn--pnvkarte-m4a.de/tilegen
+#: build/trans_wms.java:10
+msgid "PNV"
+msgstr ""
+
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#: build/trans_wms.java:11
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+#. tms:http://toolserver.org/tiles/hikebike/
+#: build/trans_wms.java:12
+msgid "Hike & Bike"
+msgstr ""
+
+#. tms:http://toolserver.org/tiles/osm-locale-hsb
+#: build/trans_wms.java:13
+msgid "Sorbische Karte"
+msgstr ""
+
+#. tms:http://toolserver.org/tiles/osm-locale-de
+#: build/trans_wms.java:14
+msgid "Deutsche Karte"
+msgstr ""
+
+#. http://wms.geoimage.at/dop-1mfree?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=Luftbild_1m&
+#: build/trans_wms.java:15
+msgid "Geoimage.at"
+msgstr ""
+
+#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
+#: build/trans_wms.java:16
+msgid "MSR Maps Topo"
+msgstr ""
+
+#. http://msrmaps.com/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#: build/trans_wms.java:17
+msgid "MSR Maps Urban"
+msgstr ""
+
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
+#: build/trans_wms.java:18
+msgid "Czech CUZK:KM"
+msgstr "捷克 CUZK:KM"
+
+#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
+#: build/trans_wms.java:19
+msgid "Czech UHUL:ORTOFOTO"
+msgstr "捷克 UHUL:ORTOFOTO"
+
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
+#: build/trans_wms.java:20
+msgid "NPE Maps"
+msgstr "英国地形测量局新大众版 (NPE) 地图"
+
+#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
+#: build/trans_wms.java:21
+msgid "NPE Maps (Tim)"
+msgstr ""
+
+#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
+#: build/trans_wms.java:22
+msgid "7th Series (OS7)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:23
+msgid "MLIT Japan (ORTHO)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:24
+msgid "MLIT Japan (ORTHO01)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:25
+msgid "MLIT Japan (ORTHO02)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:26
+msgid "MLIT Japan (ORTHO03)"
+msgstr ""
+
+#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:27
+msgid "Lodi - Italy"
+msgstr ""
+
+#. http://88.53.214.52/sitr/services/WGS84_F33/Ortofoto_ATA20072008_f33/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=CRS:84&LAYERS=0&STYLES=default&FORMAT=image/jpeg&
+#: build/trans_wms.java:28
+msgid "Sicily - Italy"
+msgstr ""
+
+#. http://wms.pcn.minambiente.it/cgi-bin/mapserv.exe?map=/ms_ogc/service/ortofoto_colore_06.map&LAYERS=ortofoto_colore_06_32,ortofoto_colore_06_33&REQUEST=GetMap&VERSION=1.1.1&FORMAT=image%2Fjpeg&
+#: build/trans_wms.java:29
+msgid "PCN 2006 - Italy"
+msgstr ""
+
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:30
+msgid "SPOTMaps (France)"
+msgstr ""
+
+#. http://www.idee.es/wms/PNOA/PNOA?REQUEST=GetMap&VERSION=1.1.1&SERVICE=WMS&SRS=EPSG:4326&LAYERS=pnoa&STYLES=default&FORMAT=image/jpeg&;http://wiki.openstreetmap.org/wiki/Spain_Potential_Datasources#Resumen_WMS
+#: build/trans_wms.java:31
+msgid "PNOA Spain"
+msgstr ""
+
+#. http://xgis.maaamet.ee/wms-pub/alus-geo?FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=pohi_vr2&
+#: build/trans_wms.java:32
+msgid "Estonia Basemap (Maaamet)"
+msgstr ""
+
+#. http://xgis.maaamet.ee/wms-pub/alus-geo?VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000&STYLES=&SRS=EPSG:4326&FORMAT=image/jpeg&
+#: build/trans_wms.java:33
+msgid "Estonia Ortho (Maaamet)"
+msgstr ""
+
+#. http://xgis.maaamet.ee/wms-pub/alus-geo?STYLES=&SRS=EPSG:4326&FORMAT=image/png&VERSION=1.1.1&REQUEST=GetMap&LAYERS=of10000,BK_MERI_polygo_8478_3,BK_VEEHOIDLA_p_8494_3,BK_VAIKEJARV_p_8493_3,BK_SUURJARV_po_8489_3,BK_SUURJOGI_po,BK_TUHAMAGI_po_8490_3,BK_SOO_polygon_8488_3,BK_SETTEBASSEI_8487_3,BK_PRUGIMAGI_p_8484_3,BK_POLD_polygo_8483_3,BK_TURBAVALI_p_8492_3,BK_METS_polygo_8479_3,BK_MARGALA_pol_8477_3,BK_LENNUVALI_p_8473_3,BK_KIVIMURD_po_8469_3,BK_KAEVANDUS_p_8468_3,BK_HOONESTATUD_8497_3,BK_VEEPIIR_lin_8495_2,BK_KRAAV_line_8472_2,BK_PEAKRAAV_li_8482_2,BK_OJA_line_8481_2,BK_JOEDL10_lin_8467_2,BK_JOEDK10_lin_8465_2,BK_KLINT_line_8470_2,BK_LIIN110_lin_8474_2,BK_LIIN220_lin_8475_2,BK_LIIN330_lin_8476_2,BK_TEXT_S_18_i_8405_1,BK_TEXT_M_10_i_8411_1,BK_TEXT_S_12_i_8409_1,BK_TEXT_S_10_i_8414_1,BK_TEXT_M_6_it_8418_1,BK_TEXT_S_8_it_8417_1,BK_TEXT_M_8_it_8416_1,BK_TEXT_M_10_i_8413_1,meri_8378_3,MapBSR_mais500_8379_3,MapBSR_mais100_8379_3,EHAK_GEN_8380_3,EHAK_GEN_8381_3,EHAK_GEN_8386_3,rannajoon100_l_8383_2,hpInt11,saar100_polyli_8384_3,hpInt12,KUJUNDUSPIIR_G_8374,KUJUNDUSPIIR_G_8365_2,KUJUNDUSPIIR_G_8374_2,rannajoon10_li_8388_2,saar10_polylin_8364_3,KUJUNDUSPIIR_G_8372,KUJUNDUSPIIR_G_8376_2,KUJUNDUSPIIR_G_8372_2,KUJUNDUSPIIR_G_8375_2,KUJUNDUSPIIR_G_8377_2,venepiir_line_8382_2,alevid_1,alevikud_1,linnaosad_1,linnad_1,MaakondNimi_te_8362_1,HaldusNimi_tex_8385_1,KUJUNDUSPIIR_G_6882_2,kylanimed_1,BK_METSATEE_li_8480_2,BK_KOHALIKTEE__8471_2,korvalmaantee,tugimaantee,trassiosa,pohimaantee,raudtee_esmane,BK_RAUDTEE_lin_8485_2,TOPOYKSUS_6569,TOPOYKSUS_7793&
+#: build/trans_wms.java:34
+msgid "Estonia Multi (Maaamet)"
+msgstr ""
+
+#. tms:http://fugro.openstreetmap.dk/fugro2005
+#: build/trans_wms.java:35
+msgid "Fugro (Denmark)"
+msgstr ""
+
+#~ msgid "to {0} primitive"
+#~ msgid_plural "to {0} primtives"
+#~ msgstr[0] "到 {0} 个原型"
+
+#~ msgid "Undelete {0} primitive"
+#~ msgid_plural "Undelete {0} primitives"
+#~ msgstr[0] "取消删除 {0} 个原型"
+
+#~ msgid ""
+#~ "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+#~ "<br>Please resolve this conflict first, then try again.</html>"
+#~ msgstr ""
+#~ "<html>图层 \"{0}\" 已经有冲突于原型<br>\"{1}\"。<br>请先调解这个冲突，然后"
+#~ "再试一次。</html>\""
+
+#~ msgid ""
+#~ "Warning: primitive ''{0}'' is already deleted on the server. Skipping "
+#~ "this primitive and retrying to upload."
+#~ msgstr ""
+#~ "警告：原型 \"{0}\" 已在服务器上删除了。正跳过这个原型并尝试重新上传。"
+
 #~ msgid "Do not show again"
 #~ msgstr "以后不要再显示"
@@ -40417 +40861 @@
 
 #~ msgid ""
-#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-#~ "loaded</html>"
-#~ msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法载入</html>"
-
-#~ msgid ""
 #~ "<html>There is at least one member in this relation referring<br>to the "
 #~ "relation itself.<br>This creates circular dependencies and is discouraged."
@@ -40451 +40890 @@
 #~ "<html>图层 \"{0}\" 已经有冲突于原型<br> \"{1}\"。 <br>请先调解这个冲突，然"
 #~ "后再试一次。</html>"
+
+#~ msgid "Click do download the currently selected area"
+#~ msgstr "点击以下载目前选取的区域"
 
 #~ msgid ""
@@ -41177 +41619 @@
 #~ msgstr "便利设施"
 
-#~ msgid "abbreviated street name"
-#~ msgstr "缩写的街道名称"
-
-#~ msgid "oneway tag on a node"
-#~ msgstr "节点上有单行道标签"
-
-#~ msgid "bridge tag on a node"
-#~ msgstr "节点上有桥梁标签"
-
-#~ msgid "wrong highway tag on a node"
-#~ msgstr "节点上错误的公路标签"
-
-#~ msgid "misspelled key name"
-#~ msgstr "拼错的键名"
-
-#~ msgid "Open Aerial Map"
-#~ msgstr "开放航空图"
-
-#~ msgid "Yahoo Sat"
-#~ msgstr "Yahoo Sat"
-
-#~ msgid "OpenStreetMap"
-#~ msgstr "OpenStreetMap"
-
-#~ msgid "OpenCycleMap"
-#~ msgstr "OpenCycleMap"
-
-#~ msgid "TilesAtHome"
-#~ msgstr "TilesAtHome"
-
 #~ msgid "Man-Made"
 #~ msgstr "人造"
@@ -41219 +41631 @@
 
 #~ msgid ""
+#~ "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
+#~ "loaded"
+#~ msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法载入"
+
+#~ msgid ""
 #~ "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 #~ msgstr "警告：从 \"{0}\" 解析 Mappaint 样式失败。例外为：{1}"
@@ -41224 +41641 @@
 #~ msgid "Building tag:"
 #~ msgstr "建筑物标签:"
-
-#~ msgid "Unnamed unclassified highway"
-#~ msgstr "未标名的未分类道路"
 
 #~ msgid ""
@@ -41249 +41663 @@
 #~ "改变选择区域"
 
+#~ msgid ""
+#~ "<html><p class=\"warning-header\">Help content for help topic missing</"
+#~ "p><p class=\"warning-body\">Help content for the help topic <strong>{0}</"
+#~ "strong> is not available yet. It is missing both in your local language "
+#~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
+#~ "and fill in the missing information. You can both edit the <a href=\"{2}"
+#~ "\">help topic in your local language ({1})</a> and the <a href=\"{3}"
+#~ "\">help topic in english</a>.</p></html>"
+#~ msgstr ""
+#~ "<html><p class=\"warning-header\">缺少帮助主题的内容</p><p class="
+#~ "\"warning-body\">帮助主题的内容 <strong>{0}</strong> 尚不能取得。不管是您"
+#~ "当地语言 ({1}) 或是英语版本都没有。<br><br>请帮助改进 JOSM 帮助系统并填好"
+#~ "缺少的信息。您可以编辑<a href=\"{2}\">将帮助主题编辑为当地的语言 ({1})</"
+#~ "a> 和 <a href=\"{3}\">英语版本</a>。</p></html>"
+
 #~ msgid "Used style"
 #~ msgstr "用户样式"
@@ -41260 +41689 @@
 #~ msgid "standard"
 #~ msgstr "标准"
-
-#~ msgid "Landsat"
-#~ msgstr "Landsat"
 
 #~ msgid "Desc"
@@ -41326 +41752 @@
 #~ msgstr "地上"
 
-#~ msgid "footway with tag foot"
-#~ msgstr "带有标签 foot 的步道"
-
-#~ msgid "temporary highway type"
-#~ msgstr "临时公路标签"
-
-#~ msgid "cycleway with tag bicycle"
-#~ msgstr "带有标签 bicycle 的自行车道"
-
-#~ msgid "NPE Maps"
-#~ msgstr "英国地形测量局新大众版 (NPE) 地图"
-
 #~ msgid "Only up to two areas can be joined at the moment."
 #~ msgstr "目前只能连接两个区域。"
@@ -41343 +41757 @@
 #~ msgid "With kiosk"
 #~ msgstr "有售货亭"
-
-#~ msgid "highway without a reference"
-#~ msgstr "没有编号的公路"
-
-#~ msgid "barrier used on a way"
-#~ msgstr "用于路径的障碍物"
-
-#~ msgid "maxspeed used for footway"
-#~ msgstr "用于步道的限速标签"
-
-#~ msgid "Landsat (mirror)"
-#~ msgstr "Landsat (镜像)"
 
 #~ msgid "Could not initialize remote control."
@@ -41384 +41786 @@
 #~ msgid "Child script have returned invalid data."
 #~ msgstr "子脚本返回了无效的数据。"
+
+#~ msgid "Launch browser with wiki help to selected object"
+#~ msgstr "在浏览器中启动选定对象的维基帮助页"
 
 #~ msgid "Allow remote control (reqires remotecontrol plugin)"
@@ -41430 +41835 @@
 #~ msgstr "{0}: 远程控制有问题"
 
-#~ msgid "layer tag with + sign"
-#~ msgstr "有 + 号的图层标签"
-
-#~ msgid "street name contains ss"
-#~ msgstr "街道名称包含 ss"
-
-#~ msgid "relation without type"
-#~ msgstr "没有类型的关系"
-
-#~ msgid "restaurant without name"
-#~ msgstr "没有名称的餐馆"
-
-#~ msgid "unusual tag combination"
-#~ msgstr "不常见的标签组合"
-
-#~ msgid "Czech CUZK:KM"
-#~ msgstr "捷克 CUZK:KM"
-
-#~ msgid "Czech UHUL:ORTOFOTO"
-#~ msgstr "捷克 UHUL:ORTOFOTO"
+#~ msgid "Only interesting direction hints (e.g. with oneway tag)."
+#~ msgstr "只提示重要的方向(例如单行道标签)。"
 
 #~ msgid "Enable built-in defaults"
@@ -41716 +42103 @@
 #~ msgid "Internal Style"
 #~ msgstr "内部样式"
+
+#~ msgid ""
+#~ "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+#~ "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+#~ msgstr ""
+#~ "<html>不论 <strong>{0}</strong> 或 <strong>{1}</strong> 都没有启用。<br>请"
+#~ "选择下载 OSM 数据，或 GPX 数据，或两个都选。</html>"