Changeset 21626 in osm for applications/editors/josm/i18n/po/zh_TW.po

Timestamp:

2010-06-09T19:51:30+02:00 (14 years ago)

Author:

stoecker

Message:

update i18n

File:

• applications/editors/josm/i18n/po/zh_TW.po (modified) (193 diffs)

applications/editors/josm/i18n/po/zh_TW.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-05 23:12+0200\n"
-"PO-Revision-Date: 2010-06-06 14:43+0000\n"
+"POT-Creation-Date: 2010-06-09 18:33+0200\n"
+"PO-Revision-Date: 2010-06-09 15:28+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-06-07 06:59+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 17:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -66 +66 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -86 +86 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
@@ -180 +180 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:171
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
 msgid "Plugins"
 msgstr "外掛"
@@ -234 +234 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -263 +263 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:914
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -389 +390 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
@@ -394 +396 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -429 +431 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -650 +652 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:278
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -1391 +1393 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:61
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:95
 msgid "Preferences"
@@ -1422 +1424 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1448 +1450 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:779
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:109
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1477 +1481 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:72
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
@@ -1657 +1661 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 msgid "Yes"
 msgstr "是"
@@ -2252 +2257 @@
 msgstr "模式：繪製焦點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
 msgid "Cannot add a node outside of the world."
 msgstr "不能在這個世界以外的地方加入節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "將節點加入路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "將既存的路徑連接到節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "在既存的路徑加入新的節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "將節點加入路徑並連接"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 msgid "Create new node."
 msgstr "建立新的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
 msgid "Select node under cursor."
 msgstr "選取游標下的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2291 +2296 @@
 msgstr[0] "插入新的節點到{0} 路徑中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Start new way from last node."
 msgstr "從最後的節點開始新的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr "從最後的節點繼續路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980
 msgid "Finish drawing."
 msgstr "結束繪製。"
@@ -2499 +2504 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
+msgid "all objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
+msgid "Also include incomplete and deleted objects in search."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
 msgid "regular expression"
 msgstr "正規表示式"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Baker Street</b> - 「Baker」和「Street」出現在何設定鍵或名稱中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Baker Street\"</b> -  「Baker Street」出現在何設定鍵或名稱中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - 「Bak」出現在名稱中的任何地方。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - 含有設定鍵「type」為「route」者。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2526 +2539 @@
 "<b>*=value</b>、<b>type=</b>、<b>*=*</b>、<b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - 名稱中沒有「Bak」。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>是否為單行道？</b> - oneway=yes, true, 1 或 on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot 設定為任何數值。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<u>Special targets:</u>"
 msgstr "<u>特殊的目標：</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2548 +2561 @@
 "<b>類型：</b> - 物件的類型 (<b>節點(node)</b>, <b>路徑(way)</b>, <b>關係(relation)</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>使用者：</b>... - 所有由某使用者改變的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - 所有物件是由匿名使用者所改變的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - 以此為 ID 的物件 (0 為新的物件)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2566 +2579 @@
 msgstr "<b>版本：</b>... - 查看這個版本的物件（未指定版本則為 0 個物件）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2572 +2585 @@
 msgstr "<b>變更組合：</b>... - 查看這個變更組合 id 的物件（未指定變更組合則為 0 個物件）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or "
@@ -2578 +2591 @@
 msgstr "<b>節點：</b>... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2584 +2597 @@
 msgstr "<b>tags:</b>... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>role:</b>... - object with given role in a relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2596 +2609 @@
 "或 <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>修改過</b> - 所有改變過的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選取的</b> - 所有選取的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>不完整</b> - 所有不完整的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>未標籤的</b> - 所有未標籤的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>expr</i></b> - 所有物件的子項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>expr</i></b> - 所有物件父項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "使用 <b>|</b> 或 <b>OR</b> 做邏輯或運算"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr "使用 <b>\"</b> 將運算子包起來（例如當鍵值包含 <b>:</b>）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2638 +2651 @@
 "</b>)。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "使用 <b>(</b> 和 <b>)</b> 將正規表示式群組起來"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2650 +2663 @@
 msgstr "過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 msgid "Submit filter"
 msgstr "送出過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 msgid "Start Search"
 msgstr "開始搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "找不到「{0}」的符合項"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "在選擇區域中搜尋不到「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404
 #, java-format
 msgid "Found {0} matches"
@@ -2689 +2702 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437
 msgctxt "search"
 msgid "CS"
@@ -2695 +2708 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438
 msgctxt "search"
 msgid "CI"
@@ -2701 +2714 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440
 msgctxt "search"
 msgid "RX"
 msgstr "RX"
+
+#. all elements
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442
+msgctxt "search"
+msgid "A"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
@@ -2831 +2850 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
@@ -3026 +3045 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
@@ -3034 +3053 @@
 msgstr "您將要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件（您沒有看到的）可能會使用它們。<br>確定要刪除嗎？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:459
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240
 msgid "Delete confirmation"
 msgstr "刪除動作確認"
 
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+msgid ""
+"You are about to delete incomplete objects.<br>This will cause problems "
+"because you don't see the real object.<br>Do you really want to delete?"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
 #, java-format
@@ -3154 +3182 @@
 msgstr "是否接受？"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:199
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3417 +3445 @@
 msgstr "無法將原型 {0} 加入資料組合，因為它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:656
 #, java-format
 msgid ""
@@ -3577 +3605 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3586 +3614 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3597 +3625 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3628 +3656 @@
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
-msgid "Area style way is not closed."
-msgstr "區域類型的路徑並未封閉。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
-msgid "More than one \"from\" way found."
-msgstr "找到一個以上「從」路徑。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
-msgid "More than one \"to\" way found."
-msgstr "找到一個以上「到」路徑。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-msgid "More than one \"via\" found."
-msgstr "找到一個以上的「經過」。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "不明的角色「{0}」。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr "「{0}」的不明成員類型。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
-msgid "No \"from\" way found."
-msgstr "找不到「從」路徑。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
-msgid "No \"to\" way found."
-msgstr "找不到「到」路徑。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
-msgid "No \"via\" node or way found."
-msgstr "找到一個以上「經過」路徑。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "The \"from\" way does not start or end at a \"via\" node."
-msgstr "「從」路徑沒有開始或結束於「經過」節點。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
-msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "「到」路徑沒有開始或結束於「經過」節點。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
-msgid "The \"from\" way does not start or end at the \"via\" way."
-msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
-msgid "The \"to\" way does not start or end at the \"via\" way."
-msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
-#, java-format
-msgid "Style for restriction {0} not found."
-msgstr "找不到限制 {0} 的樣式"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
-#, java-format
-msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "內部路徑「{0}」的樣式等同多邊形。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
-#, java-format
-msgid "Style for outer way ''{0}'' mismatches."
-msgstr "外部路徑「{0}」的樣式不符。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
-#, java-format
-msgid "Error: {0}"
-msgstr "錯誤：{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
-#, java-format
-msgid "Warning: {0}"
-msgstr "警告：{0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
@@ -4309 +4256 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Edit"
 msgstr "編輯"
@@ -4850 +4797 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:464
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:654
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:154
@@ -5637 +5584 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5700 +5647 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
@@ -5779 +5726 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "使用"
@@ -7136 +7083 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
 msgid "Update the changeset from the OSM server"
-msgstr ""
+msgstr "從 OSM 伺服器更新變更組合"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
@@ -7569 +7516 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:556
 msgid "Position"
-msgstr ""
+msgstr "位置"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:676
@@ -8570 +8517 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
 msgid "not present"
-msgstr ""
+msgstr "未顯現"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:56
@@ -8851 +8798 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
 msgid "Enter credentials for OSM API"
-msgstr ""
+msgstr "輸入 OSM API 的憑證"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112
@@ -8933 +8880 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
 msgid "Launch a file chooser to select a file"
 msgstr "開啟檔案選擇器來選擇檔案"
@@ -8943 +8890 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 msgid "No"
 msgstr "否"
@@ -9231 +9179 @@
 #, java-format
 msgid "Upload to ''{0}''"
-msgstr ""
+msgstr "上傳到「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
@@ -9239 +9187 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
 msgid "Upload the changed primitives"
-msgstr ""
+msgstr "上傳已變更的原型"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
@@ -9247 +9195 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
 msgid "Illegal upload comment"
-msgstr ""
+msgstr "不合格的上傳註解"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9259 +9207 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
 msgid "Cancel the upload and resume editing"
-msgstr ""
+msgstr "取消上傳並繼續編輯"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
 #, java-format
 msgid "Tags of changeset {0}"
-msgstr ""
+msgstr "變更組合 {0} 的標籤"
 
 #. we tried to delete an already deleted primitive.
@@ -9273 +9221 @@
 "Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
 "primitive and retrying to upload."
-msgstr ""
+msgstr "警告：原型「{0}」已在伺服器上刪除了。正略過這個原型並嘗試重新上傳。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "正在準備要上傳的原型 ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
@@ -9455 +9403 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
 msgid "Select objects to upload"
-msgstr ""
+msgstr "選擇要上傳的物件"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261
@@ -9689 +9637 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:416
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
 msgid "Description: {0}"
@@ -9782 +9730 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:890
 msgid "Download near:"
-msgstr ""
+msgstr "下載接近："
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
 msgid "track only"
-msgstr ""
+msgstr "只有軌跡"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
 msgid "waypoints only"
-msgstr ""
+msgstr "只有航點"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
 msgid "track and waypoints"
-msgstr ""
+msgstr "軌跡與航點"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1017
@@ -9898 +9846 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
-msgstr ""
+msgstr "資料組合一致性測試"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
-msgstr ""
+msgstr "沒有發現問題"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
-msgstr ""
+msgstr "發現下列問題："
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
@@ -9912 +9860 @@
 "<html>Upload of unprocessed GPS data as map data is considered "
 "harmful.<br>If you want to upload traces, look here:</html>"
-msgstr ""
+msgstr "<html>上傳未經處理的 GPS 資料當作地圖資料是不適當的。<br>如果您想要上傳軌跡，請看這裡：</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
@@ -10034 +9982 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
 msgid "Matches first photo with first gpx point"
-msgstr ""
+msgstr "將第一張照片與第一個 gpx 點配對"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
@@ -10042 +9990 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
 msgid "Override position for: "
-msgstr ""
+msgstr "覆蓋此地點： "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
@@ -10089 +10037 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "No images could be matched!"
-msgstr ""
+msgstr "無法配對任何圖片！"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
@@ -10258 +10206 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
 msgid "Image file could not be deleted."
-msgstr ""
+msgstr "無法刪除圖片檔案。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
@@ -10277 +10225 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
-msgstr ""
+msgstr "顯示有地理標記的圖片"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
@@ -10323 +10271 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "將對話盒移至側邊窗格"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
@@ -10441 +10389 @@
 msgstr "在顯示 URL 時發生錯誤"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:129
 msgid "Illegal dash pattern, values must be positive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:135
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
@@ -10475 +10423 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
 msgid "Save Access Token in preferences"
-msgstr ""
+msgstr "在偏好設定中儲存存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
@@ -10756 +10704 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
-msgstr ""
+msgstr "點選以測試存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
@@ -10768 +10716 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
 msgid "Please select an authorization procedure: "
-msgstr ""
+msgstr "請選擇一種授權程序： "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:244
 #, java-format
 msgid "Get an Access Token for ''{0}''"
-msgstr ""
+msgstr "取得「{0}」的存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344
 msgid "Close the dialog and cancel authorization"
-msgstr ""
+msgstr "關閉對話盒並取消授權"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363
@@ -10813 +10761 @@
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
-msgstr ""
+msgstr "無法驗證 OAuth 要求「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
@@ -10827 +10775 @@
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr ""
+msgstr "正在驗證使用者「{0}」的 session ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
@@ -10912 +10860 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
 msgid "Retrieve Request Token"
-msgstr ""
+msgstr "取回要求記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
@@ -10931 +10879 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
-msgstr ""
+msgstr "要求存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
@@ -10951 +10899 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "回到步驟 1/3"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
@@ -10976 +10924 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
-msgstr ""
+msgstr "取回存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "點選以取回存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
 msgid "Testing OAuth Access Token"
-msgstr ""
+msgstr "正在測試 OAuth 存取記號"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
@@ -11102 +11050 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid "Please select the row to edit."
 msgstr "請選擇要編輯的列。"
@@ -11114 +11062 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11423 +11371 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Create markers when reading GPX."
-msgstr ""
+msgstr "讀取 GPX 時建立標記。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
@@ -11595 +11543 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:135
 msgid "Enable built-in defaults"
 msgstr "啟用內建預設值"
@@ -11601 +11549 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
-msgstr ""
+msgstr "啟用內建圖示預設值"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
 msgid "Used style"
-msgstr ""
+msgstr "使用者樣式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
@@ -11632 +11580 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter a search expression"
-msgstr ""
+msgstr "請輸入搜尋詞句"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
 msgid "Plugin update policy"
-msgstr ""
+msgstr "外掛程式更新原則"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
@@ -11652 +11600 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:275
 msgid "Download the list of available plugins"
-msgstr ""
+msgstr "下載可用的外掛程式清單"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:303
@@ -11666 +11614 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:304
 msgid "Update the selected plugins"
-msgstr ""
+msgstr "更新選取的外掛程式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:315
@@ -11680 +11628 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:332
 msgid "Plugins up to date"
-msgstr ""
+msgstr "外掛程式已是最新"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:400
 msgid "Configure sites..."
-msgstr ""
+msgstr "設定網站..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:401
@@ -11710 +11658 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:498
 msgid "JOSM Plugin description URL"
-msgstr ""
+msgstr "JOSM 外掛程式描述 URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
@@ -11839 +11787 @@
 msgstr "修飾鍵群組"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:93
 msgid "Close the preferences dialog and discard preference updates"
 msgstr "關閉偏好設定視窗並放棄偏好設定的更新"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:111
 msgid "Save the preferences and close the dialog"
-msgstr ""
+msgstr "儲存偏好設定並關閉對話盒"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
 msgid "Display Settings"
 msgstr "顯示設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -11858 +11806 @@
 msgstr "各種影響整個程式視覺呈現的設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
 msgid "Connection Settings"
 msgstr "連線設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
 msgid "Connection Settings for the OSM server."
 msgstr "OSM 伺服器的連線設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
 msgid "Map Settings"
 msgstr "地圖設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
 msgid "Settings for the map projection and data interpretation."
 msgstr "地圖投影與資料轉譯設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
 msgid "Audio Settings"
 msgstr "音效設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
 msgid "Settings for the audio player and audio markers."
 msgstr "音效播放程式與音效標記的設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
 msgid "Configure available plugins."
 msgstr "設定可用的外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143
 msgid "Download plugins"
 msgstr "下載外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
@@ -11963 +11911 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:156
 msgid "Active styles"
-msgstr ""
+msgstr "使用中樣式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:166
 #, java-format
 msgid "Available styles (from {0})"
-msgstr ""
+msgstr "可用的樣式 (來自 {0})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:172
@@ -11974 +11922 @@
 msgstr "圖示路徑"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:408
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:425
 #, java-format
 msgid "Short Description: {0}"
 msgstr "簡短說明：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:408
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:425
 #, java-format
 msgid "URL: {0}"
 msgstr "URL：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:427
 #, java-format
 msgid "Author: {0}"
 msgstr "作者：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:413
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:430
 #, java-format
 msgid "Webpage: {0}"
 msgstr "網頁：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:419
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:436
 #, java-format
 msgid "Version: {0}"
 msgstr "版本：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:641
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
 msgid "New"
 msgstr "新增"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
 msgid "Add a filename or an URL of an active style"
 msgstr "為使用的樣式加入檔案名稱或 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:448
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:465
 msgid "Remove the selected styles from the list of active styles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:469
+msgstr "從使用中樣式清單中移除選取的樣式"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:486
 msgid "Edit the filename or URL for the selected active style"
 msgstr "編輯使用的樣式的檔案名稱或 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:491
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:508
 msgid "Add the selected available styles to the list of active styles"
 msgstr "將選取的樣式加入使用中樣式清單"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:514
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:531
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:625
+msgstr "從「{0}」重新載入可用的樣式清單"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:642
 msgid "Add a new icon path"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:638
+msgstr "加入新的圖示路徑"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:655
 msgid "Remove the selected icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:659
+msgstr "移除選取的圖示路徑"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:676
 msgid "Edit the selected icon path"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:704
+msgstr "編輯選取的圖示路徑"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:721
 #, java-format
 msgid "Loading style sources from ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:726
+msgstr "從「{0}」載入樣式來源"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:743
 #, java-format
 msgid ""
@@ -12050 +11998 @@
 msgstr "<html>無法從這裡載入樣式來源清單：<br>「{0}」。<br><br>詳細資料 (未翻譯):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:798
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr "警告：樣式清單「{0}」中項目的格式不正確。得到「{1}」。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#, java-format
+msgid ""
+"Could not read tagging preset source: {0}\n"
+"Do you want to keep it?"
+msgstr ""
+
+#. Should not happen, but at least show message
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
+#, java-format
+msgid "Could not read tagging preset source {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:87
+#, java-format
+msgid ""
+"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
+"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
+"{3}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#, java-format
+msgid ""
+"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
+"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+#, java-format
+msgid ""
+"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
+"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+#, java-format
+msgid ""
+"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
+"it?<br><br><table width=600>Error is: {1}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:133
 msgid "Sort presets menu"
 msgstr "排序預設組合選單"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
 msgid "Tagging Presets"
 msgstr "加上預先組合標籤"
@@ -12083 +12073 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
 msgid "Action parameters"
-msgstr ""
+msgstr "動作參數"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
 msgid "Parameter name"
-msgstr ""
+msgstr "參數名稱"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
 msgid "Parameter value"
-msgstr ""
+msgstr "參數數值"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
@@ -12114 +12104 @@
 #, java-format
 msgid "{0}: Version {1} (local: {2})"
-msgstr ""
+msgstr "{0}：版本 {1} (本地端： {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:72
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113
 msgid "Ask before updating"
-msgstr ""
+msgstr "更新前詢問"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
@@ -12139 +12129 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
 msgid "Update interval (in days):"
-msgstr ""
+msgstr "更新間隔 (以日計)："
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128
@@ -12150 +12140 @@
 #, java-format
 msgid "Testing OSM API URL ''{0}''"
-msgstr ""
+msgstr "正在測試 OSM API URL「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
@@ -12435 +12425 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:561
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 msgid "Optional Attributes:"
 msgstr "額外屬性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 msgid "closedway"
 msgstr "封閉路徑"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:748
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12481 +12471 @@
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:828
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:838
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:891
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:901
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12498 +12488 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:894
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:896
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:906
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:914
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:979
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 msgid "Change Properties"
 msgstr "改變屬性"
@@ -13221 +13211 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
-#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
+#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -14194 +14184 @@
 "<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
 "problem with transferring data.<br>Details(untranslated): {1}</html>"
-msgstr ""
+msgstr "<html>無法由此上傳或下載資料：<br>「{0}」<br>因為傳輸資料有問題。<br>詳細資料(未翻譯)： {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
@@ -14201 +14191 @@
 "<html>Failed to download data. Its format is either unsupported, ill-formed, "
 "and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
-msgstr ""
+msgstr "<html>無法下載資料。它的格式可能不支援、格式有問題和/或不一致。<br><br>詳細資料 (未翻譯)： {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:352
@@ -14210 +14200 @@
 "later.</html>"
 msgstr ""
+"<html>OSM 伺服器<br>「{0}」<br>回報了內部的伺服器錯誤。<br>這很可能是暫時性的錯誤。請稍後再試一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
+msgstr "OSM 伺服器「{0}」回報了錯誤的要求。<br>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
@@ -14221 +14212 @@
 "large.<br>Either request a smaller area or use an export file provided by "
 "the OSM community."
-msgstr ""
+msgstr "您嘗試下載的區域太大或是您的要求太大。<br>可以要求小一點的區域或是使用 OSM 社群提供的匯出檔案。"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374
@@ -14244 +14235 @@
 "preferences and your internet connection.</html>"
 msgstr ""
+"<html>無法連線至遠端伺服器<br>「{0}」。<br>無法解析主機名稱「{1}」。<br>請檢查您偏好設定中的 API URL "
+"與網際網路連線。</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
@@ -14253 +14246 @@
 "object.<br><br>The error message is:<br>{0}</html>"
 msgstr ""
+"<html>伺服器回報有物件已被刪除。<br>如果您嘗試更新或刪除這個物件則會<strong>上傳失敗</strong>。<br>如果您嘗試下載這個物件則"
+"會<strong>下載失敗</strong>。<br><br>錯誤的訊息為：<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:396
@@ -14262 +14257 @@
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "警告：無法處理 zip 檔案「{0}」。例外為：{1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
@@ -14270 +14265 @@
 "Warning: failed to access directory ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr ""
+msgstr "警告：基於安全性理由無法存取目錄「{0}」。例外為：{1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
@@ -14277 +14272 @@
 "Fatal: failed to locate image ''{0}''. This is a serious configuration "
 "problem. JOSM will stop working."
-msgstr ""
+msgstr "嚴重的錯誤：無法定位圖片「{0}」。這是嚴重的組態問題。JOSM 會停止運作。"
 
 #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
@@ -14284 +14279 @@
 "Warning: failed to derive wiki language prefix from JOSM locale code "
 "''{0}''. Using default code ''en''."
-msgstr ""
+msgstr "警告：無法從 JOSM 地區代碼「{0}」取得 wiki 語言前綴。使用預設的代碼「en」。"
 
 #: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
@@ -14290 +14285 @@
 "Failed to open URL. There is currently no platform set. Please set a "
 "platform first."
-msgstr ""
+msgstr "無法開啟 URL。目前尚未設定平台。請先設定平台。"
 
 #. This list if far from complete!
@@ -14350 +14345 @@
 "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
 "was: {1}"
-msgstr ""
+msgstr "警告：基於安全性理由無法從「{0}」讀取 MOTD。例外為：{1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
@@ -14357 +14352 @@
 "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
-msgstr ""
+msgstr "偏好設定的設定鍵「{0}」不包含「{1}」。不能從偏好設定中回復視窗位置大小。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
@@ -14364 +14359 @@
 "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
 "{2}. Cannot restore window geometry from preferences."
-msgstr ""
+msgstr "偏好設定的設定鍵「{0}」沒有提供「{1}」的整數值。得到「{2}」。不能從偏好設定中回復視窗位置大小。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
@@ -14371 +14366 @@
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Cannot restore window geometry from preferences."
-msgstr ""
+msgstr "無法解析偏好設定的設定鍵「{0}」的欄位「{1}」。例外為：「{2}」。不能從偏好設定中回復視窗位置大小。"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
@@ -14378 +14373 @@
 "Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
-msgstr ""
+msgstr "偏好設定的設定鍵「{0}」不存在。不能從偏好設定中回復視窗位置大小。"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -14404 +14399 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
 msgid "Private (only shared as anonymous, unordered points)"
-msgstr ""
+msgstr "私人 (只以匿名分享，無順序的點)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60
 msgid "Public (shown in trace list and as anonymous, unordered points)"
-msgstr ""
+msgstr "公開 (以匿名顯示於軌跡清單，無順序的點)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
-msgstr ""
+msgstr "可追蹤 (只以匿名分享，有時間戳記順序的點)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
@@ -14418 +14413 @@
 "Identifiable (shown in trace list and as identifiable, ordered points with "
 "timestamps)"
-msgstr ""
+msgstr "可辨識 (以可辨識的方式顯示於軌跡清單，有時間戳記順序的點)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
@@ -14438 +14433 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
-msgstr ""
+msgstr "定義您的軌跡對其他 OSM 使用者的可見性。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
+msgstr "(那代表什麼？)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -14594 +14589 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
 msgid "Convert way to individual house numbers."
-msgstr ""
+msgstr "將路徑轉換為個別的房屋號碼。"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
 #, java-format
 msgid "Will associate {0} additional house number nodes"
-msgstr ""
+msgstr "將關聯 {0} 個額外的房屋號碼節點"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
@@ -14635 +14630 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
 msgid "Expected odd numbers for addresses"
-msgstr ""
+msgstr "預測的奇數地址"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
 msgid "Expected even numbers for addresses"
-msgstr ""
+msgstr "預測的偶數地址"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
 msgid "Expected valid number for address increment"
-msgstr ""
+msgstr "預測地址增加的數字"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 msgid "Country code must be 2 letters"
-msgstr ""
+msgstr "國碼只能使用 2 個字元"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
 msgid "Please enter valid number for starting and ending address"
-msgstr ""
+msgstr "請輸入開始與結尾地址的有效編號"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
 msgid "Alphabetic address must end with a letter"
-msgstr ""
+msgstr "字母住址必須以字母結尾"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr ""
+msgstr "開始與結尾的編號必須屬於同一個字母地址"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
 msgid "Starting address letter must be less than ending address letter"
-msgstr ""
+msgstr "開始住址的字母必須少於結尾住址的字母"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
 msgid "Please enter valid number for starting address"
-msgstr ""
+msgstr "請輸入開始住址的有效數字"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
 msgid "Please enter valid number for ending address"
-msgstr ""
+msgstr "請輸入結尾住址的有效數字"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
 msgid "Starting address number must be less than ending address number"
+msgstr "開始住址的數字必須少於結尾住址的數字"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
+msgid "Align Way Segments"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
+msgid ""
+"Makes a pair of selected way segments parallel by rotating one of them "
+"around a chosen pivot."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
+msgid "Align Ways"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
+msgid ""
+"You cannot align connected segments.\n"
+"Please select two segments that don''t share any nodes."
+msgstr ""
+"您不能對齊相互連接的區段。\n"
+"請選取兩個沒有共用任何節點的區段。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
+msgid "AlignWayS message"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
+msgid ""
+"Aligning would result nodes outside the world.\n"
+"Your action is being reverted."
+msgstr ""
+"對齊會造成節點掉出世界之外。\n"
+"您的動作被還原了。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
+msgid "AlignWays Tips"
+msgstr "AlignWays 密訣"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:172
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "參數「{0}」不能為 null"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"要對齊的區段不能和參考用區段是同一個。\n"
+"請選擇不同的區段來對齊。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
+msgstr ""
+"參考用區段不能和要對齊的區段是同一個。\n"
+"請選擇不同的參考區段。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:54
+msgid ""
+"<html>\n"
+"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
+"italic;\">\n"
+"<span style=\"font-size: large;\">Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> "
+"Plugin...</span>\n"
+"</div>\n"
+"</html>"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
+"italic;\">\n"
+"<span style=\"font-size: large;\">歡迎使用</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> 外掛程式<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...或者它應該被稱為 <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> 外掛程式...</span>\n"
+"</div>\n"
+"</html>"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:79
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays會幫助您對齊兩個\n"
+"路徑區段。舉例來說，當您在描繪建築物的\n"
+"輪廓而且希望它的邊緣和街道或道路平行\n"
+"時會很有幫助。<br>\n"
+"<br>\n"
+"在您開始前有些密訣可能有所幫助：\n"
+"</p>\n"
+"</html>\n"
+"\n"
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:86
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> 要這麼做您可以按<b><i><span "
+"style=\"color:green\">Ctrl-點選</span></i></b>\n"
+"一個區段。而另一個，要被對齊的區段就會變得跟這個區段\n"
+"平行。</li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:90
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:94
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">Shift-A</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>對齊區段。</b> 請按 <b><i><span style=\"color:green\">Shift-"
+"A</span></i></b>。另外您可以在<b>工具</b>選單找到這個指令\n"
+"，也可以把這個動作放置到<b>工具列</b>上。\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> 如果您想要重新開始選擇，有一個很簡單的方法： <b><i><span "
+"style=\"color:green\">Alt-點選</span></i></b> 地圖的某個地方。\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+msgid "Don''t show this again"
 msgstr ""
 
@@ -14695 +14932 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Decrement"
-msgstr ""
+msgstr "遞減"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
@@ -14735 +14972 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
-msgstr ""
+msgstr "點到建築的一角以開始繪製"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
-msgstr ""
+msgstr "點到建築物對面的結尾"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
@@ -14751 +14988 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
-msgstr ""
+msgstr "點選解開建築 (只適用向量圖片)"
 
 #. group "Man-Made"
@@ -14764 +15001 @@
 "Buildings layer and an OSM data layer."
 msgstr ""
+"這個功能需要（至少）一個特殊的 cadastre\n"
+"建築圖層和 OSM 資料圖層。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
@@ -14772 +15011 @@
 "(No = new cache)"
 msgstr ""
+"在快取中找到位置「{0}」。\n"
+"是否先載入快取？\n"
+"(否 = 新增快取)"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -14786 +15028 @@
 "Probably an old version of the cache file."
 msgstr ""
+"載入檔案時發生錯誤。\n"
+"可能是舊版的快取檔案。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
@@ -14806 +15050 @@
 #, java-format
 msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
-msgstr ""
+msgstr "蘭勃特 CC9 區 {0} 快取檔案 (.CC{0})"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
@@ -14837 +15081 @@
 "Server in maintenance or temporary overloaded."
 msgstr ""
+"不能開啟新的客戶端 session。\n"
+"伺服器正在維護或是暫時過載。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89
@@ -14844 +15090 @@
 "or action canceled"
 msgstr ""
+"城/鎮 {0} 找不到或無法使用\n"
+"或是動作已取消"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:395
@@ -14885 +15133 @@
 msgid ""
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
-msgstr ""
+msgstr "警告：無法將選項窗格置於最上層。例外為：{0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -14906 +15154 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286
 msgid "Disable image cropping during georeferencing."
-msgstr ""
+msgstr "在進行地理參照時停用圖片剪裁。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
@@ -15124 +15372 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Nearest-Neighbor (fastest) [ Default ]"
-msgstr ""
+msgstr "最鄰近 (最快) [預設值]"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
@@ -15137 +15385 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195
 msgid "Vector images grab multiplier:"
-msgstr ""
+msgstr "向量圖片抓取倍數："
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207
 msgid "Grab one image full screen"
-msgstr ""
+msgstr "抓取一張全螢幕圖片"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
@@ -15163 +15411 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247
 msgid "See, rivers, swimming pools."
-msgstr ""
+msgstr "海、河流、游泳池。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250
 msgid "Buildings, covers, underground constructions."
-msgstr ""
+msgstr "建築、遮蔽物、地下建築物。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253
 msgid "Symbols like cristian cross."
-msgstr ""
+msgstr "符號，像十字架之類。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256
@@ -15214 +15462 @@
 "Automatically selects the first WMS layer if multiple layers exist when "
 "grabbing."
-msgstr ""
+msgstr "如果抓取時有多個圖層則自動選擇第一個 WMS 圖層。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -15288 +15536 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
 msgid "Grab building layer only"
-msgstr ""
+msgstr "只抓取建築物圖層"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:31
@@ -15298 +15546 @@
 "projections and retry"
 msgstr ""
+"要啟用 cadastre WMS 外掛程式，\n"
+"請改變目前的投影法為 cadastre 投影法\n"
+"後再試一次"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
@@ -15311 +15562 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:55
 msgid "Grab non-georeferenced image"
-msgstr ""
+msgstr "抓取非地理參照的圖片"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:79
@@ -15322 +15573 @@
 "Do you want to use them ?"
 msgstr ""
+"這張圖片包含地理參照資料。\n"
+"您是否想要使用它們？"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:186
@@ -15328 +15581 @@
 "(two points required)"
 msgstr ""
+"點選剪裁圖片的第一個角落\n"
+"(需要兩個點)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:187
@@ -15336 +15591 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:205
 msgid "Click second corner for image cropping"
-msgstr ""
+msgstr "點選剪裁圖片的第二個角落"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:225
@@ -15358 +15613 @@
 "or just retry "
 msgstr ""
+"您是否想要完全取消或是\n"
+"要再試一次 "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:292
 msgid "Enter cadastre east,north position"
-msgstr ""
+msgstr "輸入 cadastre 東,北 方位置"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:294
 msgid "(Warning: verify north with arrow !!)"
-msgstr ""
+msgstr "(警告：檢驗有箭頭的北方！！)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:296
@@ -15397 +15654 @@
 msgid ""
 "Cannot load cache {0} which is not compatible with current projection zone"
-msgstr ""
+msgstr "不能載入快取 {0}，因為與目前的投影法區域不相容"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
@@ -15403 +15660 @@
 msgid ""
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
-msgstr ""
+msgstr "選取的檔案 {0} 不是這個外掛程式的快取檔案（無效的延伸檔名）"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
 #, java-format
 msgid "The location {0} is already on screen. Cache not loaded."
-msgstr ""
+msgstr "位置 {0} 已經在畫面上。快取未載入。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
@@ -15462 +15719 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45
 msgid "Export as PNG format (only raster images)"
-msgstr ""
+msgstr "匯出為 PNG 格式 (只有點陣圖)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:39
@@ -15471 +15728 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:40
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr ""
+msgstr "調整 WMS 圖層的地點 (只有點陣圖)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:68
@@ -16140 +16397 @@
 msgstr "無法擷取圖片"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:149
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:171
+msgid "Not connected"
+msgstr "未連線"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:162
+msgid "Connection Failed"
+msgstr "連線失敗"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:192
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:208
 msgid "Connecting"
 msgstr "正在連線"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:212
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:233
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:248
 msgid "Connected"
 msgstr "已連線"
-
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:226
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:253
-msgid "Not connected"
-msgstr "未連線"
-
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:241
-msgid "Connection Failed"
-msgstr "連線失敗"
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:129
@@ -16904 +17162 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 msgid "Revert changeset"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:47
 msgid "Reverting..."
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:54
+msgid ""
+"This changeset have objects outside the downloaded area.\n"
+"It is needed to download them before reverting. Do you want to continue?"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:56
+msgid "Confirm"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:58
+msgid "Fetching missing primitives"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:71
 #, java-format
 msgid "Revert changeset #{0}"
@@ -18141 +18413 @@
 msgstr "沒有驗證上的錯誤"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:174
 msgid "Grid"
 msgstr "格線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
 #, java-format
 msgid ""
@@ -18397 +18669 @@
 
 #. group "Relations"
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
 #: build/trans_presets.java:3189
 msgid "Multipolygon"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:50
 msgid "This test checks if multipolygons are valid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:120
+msgid "Area style way is not closed"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
 msgid "No outer way for multipolygon"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:151
+msgid "No style in multipolygon relation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
+msgid "Style for inner way equals multipolygon"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
+msgid "Style for outer way mismatches"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:186
+msgid "No style for multipolygon"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:191
 msgid "Multipolygon is not closed"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:140
-msgid "Multipolygon inner way is outside."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:213
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:216
 msgid "Intersection between multipolygon ways"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:154
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:227
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:157
-msgid "Non-Way in multipolygon."
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:230
+msgid "Non-Way in multipolygon"
 msgstr ""
 
@@ -18574 +18866 @@
 msgstr "這個測試會檢查名稱近似的路徑，因為那有可能是拼錯字了。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:157
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
 msgid "Properties checker :"
 msgstr "屬性檢查器："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:158
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:154
 msgid "This plugin checks for errors in property keys and values."
 msgstr "這個外掛程式會檢查屬性中的設定鍵和數值有無錯誤。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:290
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:286
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "無效的標籤檢查行- {0}： {1}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:303
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:299
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "無效的拼字檢查行：{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:314
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:310
 #, java-format
 msgid ""
@@ -18601 +18893 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:451
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:452
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:458
 msgid "Illegal tag/value combinations"
 msgstr "不合法的標籤/數值組合"
 
-#. passing translated text also to original string, as we already
-#. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
-msgid "Painting problem"
-msgstr "繪圖問題"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "設定鍵「{0}」無效。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
 msgid "Tag value contains character with code less than 0x20"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:498
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
 msgid "Tag key contains character with code less than 0x20"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:504
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
 msgid "Tag value longer than allowed"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:491
 msgid "Tag key longer than allowed"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:516
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
 msgid "Tags with empty values"
 msgstr "標籤沒有數值"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:522
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:503
 msgid "Invalid property key"
 msgstr "無效的屬性設定鍵"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:528
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509
 msgid "Invalid white space in property key"
 msgstr "屬性設定鍵中有無效的空白字元"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:515
 msgid "Property values start or end with white space"
 msgstr "屬性數值以空白字元開頭或結尾"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:540
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
 msgid "Property values contain HTML entity"
 msgstr "屬性數值含有 HTML 標記"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:567
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "設定鍵「{0}」不在預設組合裡。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:568
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549
 msgid "Presets do not contain property key"
 msgstr "預設組合不包含屬性設定鍵"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:590
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:571
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "設定鍵「{1}」的數值「{0}」不在預設組合中。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:591
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:572
 msgid "Presets do not contain property value"
 msgstr "預設組合不包含屬性數值"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:650
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
 msgid "Check property keys."
 msgstr "檢查屬性設定鍵。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "檢查文字清單以驗證屬性設定鍵是有效的。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:658
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Use complex property checker."
 msgstr "使用複雜的屬性檢查器。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
 msgid "Validate property values and tags using complex rules."
 msgstr "使用複雜的規則驗證屬性數值。"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:658
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:680
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:681
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "TagChecker source"
 msgstr "標籤檢查器來源"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 msgid ""
 "The sources (URL or filename) of spell check (see "
@@ -18709 +18995 @@
 "http://wiki.openstreetmap.org/index.php/User:JLS/speller）"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Add a new source to the list."
 msgstr "將新的來源加入清單。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Edit the selected source."
 msgstr "編輯選取的來源。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:723
 msgid "Delete the selected source from the list."
 msgstr "從清單刪除選取的來源。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Data sources"
 msgstr "資料來源"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:768
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Check property values."
 msgstr "檢查屬性數值。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Validate that property values are valid checking against presets."
 msgstr "驗證屬性數值合於預設組合的要求。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:776
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Check for FIXMES."
 msgstr "檢查 FIXMES。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:777
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "尋找在任何屬性數值中含有 FIXME 的節點或路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:784
-msgid "Check for paint notes."
-msgstr "檢查繪圖筆記。"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:785
-msgid "Check if map painting found data errors."
-msgstr "檢查地圖繪製是否發現資料錯誤。"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:792
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:761
 msgid "Use default data file."
 msgstr "使用預設的資料檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:793
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:762
 msgid "Use the default data file (recommended)."
 msgstr "使用預設的資料檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:796
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Use default tag ignore file."
 msgstr "使用預設標籤忽略檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:797
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:766
 msgid "Use the default tag ignore file (recommended)."
 msgstr "使用預設標籤忽略檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:800
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769
 msgid "Use default spellcheck file."
 msgstr "使用預設的拼字檢查檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:801
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:770
 msgid "Use the default spellcheck file (recommended)."
 msgstr "使用預設的拼字檢查檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:895
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:862
 msgid "Fix properties"
 msgstr "修正屬性"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1010
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977
 msgid "Could not find element type"
 msgstr "找不到元件類型"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1012
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:979
 msgid "Incorrect number of parameters"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1030
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:997
 msgid "Could not find warning level"
 msgstr "找不到警告等級"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1039
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1006
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不合法的辭句「{0}」"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1043
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1010
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "不合法的正規表示式「{0}」"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:35
+msgid "Turnrestriction"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:36
+msgid "This test checks if turnrestrictions are valid"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:103
+msgid "Unknown role"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:107
+msgid "Unknown member type"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:113
+msgid "More than one \"from\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:115
+msgid "More than one \"to\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:117
+msgid "More than one \"via\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:120
+msgid "No \"from\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:124
+msgid "No \"to\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:128
+msgid "No \"via\" node or way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:138
+msgid "The \"from\" way does not start or end at a \"via\" node"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:143
+msgid "The \"to\" way does not start or end at a \"via\" node"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:176
+msgid "The \"from\" way does not start or end at a \"via\" way."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:181
+msgid "The \"to\" way does not start or end at a \"via\" way."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
@@ -19629 +19964 @@
 msgstr ""
 
+#. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:6
 msgid "Tools for drawing buildings."
 msgstr ""
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:8
 msgid "A special handler for the French land registry WMS server."
 msgstr "用於法國土地登記 WMS 伺服器的特別處理程式。"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:10
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -19652 +19988 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:12
 msgid "Create a grid of ways."
 msgstr "建立路徑的格線。"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:14
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -19663 +19999 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:16
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "允許直接將多種檔案格式匯入 JOSM。"
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:18
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -19675 +20011 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:20
 msgid "Duplicate Ways with an offset"
 msgstr "重製路徑並位移"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:22
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -19687 +20023 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:24
 msgid ""
 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
@@ -19693 +20029 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:26
 msgid "Visualizes routing information as a routing graph."
 msgstr ""
 
 #. Plugin grid
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:28
 msgid "Provide a background layer that displays a map grid"
 msgstr "提供顯示地圖格線的背景圖層"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:30
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -19713 +20049 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:32
 msgid "Helps vectorizing WMS images."
 msgstr "協助將 WMS 圖片向量化。"
 
 #. Plugin livegps
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:34
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -19724 +20060 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:36
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -19732 +20068 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:38
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr ""
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:40
 msgid "Simply convert an area to a multipolygon."
 msgstr ""
 
 #. Plugin multipoly
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:42
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -19749 +20085 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:44
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -19758 +20094 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:46
 msgid "Displays an OpenLayers background image"
 msgstr "顯示 OpenLayers 背景圖片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:48
 msgid "Imports issues from OpenStreetBugs"
 msgstr "匯入OpenStreetBugs 的議題"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:50
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -19774 +20110 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:52
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -19780 +20116 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:54
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -19787 +20123 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:56
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -19794 +20130 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:58
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:60
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -19805 +20141 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:62
 msgid "Let other applications send commands to JOSM."
 msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. Plugin reverter
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:64
 msgid "Plugin for reverting changesets"
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:66
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -19822 +20158 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:68
 msgid "Provides routing capabilities."
 msgstr "提供路線規畫的功能。"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:70
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -19834 +20170 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:72
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:74
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格線中編輯標籤的對話盒。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:76
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -19852 +20188 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:78
 msgid "Make terraced houses out of single blocks."
 msgstr "讓連棟房屋能超出單一區塊。"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:80
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -19864 +20200 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:82
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19871 +20207 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:84
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -19878 +20214 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:86
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:88
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19890 +20226 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:90
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -19898 +20234 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:92
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19905 +20241 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:94
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:96
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:98
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19922 +20258 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:100
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -19991 +20327 @@
 #. are supplied, then "values" will be treated as "display_values" and translated instead.
 #. -->
-#. <annotations>
+#. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
 #: build/trans_presets.java:77
 msgid "Highways"
@@ -21981 +22317 @@
 
 #. item "Barriers/Cycle Barrier"
-#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
 #: build/trans_presets.java:762
@@ -22039 +22375 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22088 +22423 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22183 +22517 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -32418 +32751 @@
 #~ msgstr "關係"
 
+#~ msgid "Area style way is not closed."
+#~ msgstr "區域類型的路徑並未封閉。"
+
 #, java-format
 #~ msgid "multipolygon way ''{0}'' is not closed."
@@ -32426 +32762 @@
 #~ msgstr "路徑「{0}」少於兩個節點。"
 
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "找到一個以上「從」路徑。"
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "找到一個以上「到」路徑。"
+
+#~ msgid "No \"via\" node or way found."
+#~ msgstr "找到一個以上「經過」路徑。"
+
 #, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
@@ -32441 +32786 @@
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "內部路徑「{0}」在外。"
+
+#, java-format
+#~ msgid "Style for inner way ''{0}'' equals multipolygon."
+#~ msgstr "內部路徑「{0}」的樣式等同多邊形。"
+
+#, java-format
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "外部路徑「{0}」的樣式不符。"
 
 #~ msgid "EPSG:4326"
@@ -32559 +32912 @@
 
 #, java-format
+#~ msgid "Error: {0}"
+#~ msgstr "錯誤：{0}"
+
+#, java-format
+#~ msgid "Warning: {0}"
+#~ msgstr "警告：{0}"
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "找不到「從」路徑。"
+
+#~ msgid "More than one \"via\" found."
+#~ msgstr "找到一個以上的「經過」。"
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "找不到「到」路徑。"
+
+#, java-format
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "不明的角色「{0}」。"
+
+#, java-format
+#~ msgid "Unknown member type for ''{0}''."
+#~ msgstr "「{0}」的不明成員類型。"
+
+#, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "路徑「{0}」和「{1}」之間的十字路。"
@@ -32567 +32945 @@
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "參數「{0}」不能為空值(null)"
+
+#, java-format
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "找不到限制 {0} 的樣式"
 
 #~ msgid "Apply partial resolutions"
@@ -32971 +33353 @@
 #~ msgid "Are you sure?"
 #~ msgstr "您確定嗎？"
+
+#~ msgid "Painting problem"
+#~ msgstr "繪圖問題"
+
+#~ msgid "Check if map painting found data errors."
+#~ msgstr "檢查地圖繪製是否發現資料錯誤。"
+
+#~ msgid "Check for paint notes."
+#~ msgstr "檢查繪圖筆記。"
 
 #~ msgid "Reached the end of the line"
@@ -33209 +33600 @@
 
 #, java-format
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "參數「{0}」不能為 null"
-
-#, java-format
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "需要 Id > 0，卻收到 {0}"
@@ -33420 +33807 @@
 #~ "<b>選擇：</b>按住滑鼠左鍵並繪出一個方格。"
 
+#~ msgid "The \"from\" way does not start or end at a \"via\" node."
+#~ msgstr "「從」路徑沒有開始或結束於「經過」節點。"
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" node."
+#~ msgstr "「到」路徑沒有開始或結束於「經過」節點。"
+
+#~ msgid "The \"from\" way does not start or end at the \"via\" way."
+#~ msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
+
+#~ msgid "The \"to\" way does not start or end at the \"via\" way."
+#~ msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
+
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 #~ msgstr "<html>不能開啟目錄。<br>請選擇一個檔案！</html>"