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

Timestamp:

2010-05-16T13:46:55+02:00 (14 years ago)

Author:

stoecker

Message:

i18n update

File:

• applications/editors/josm/i18n/po/zh_TW.po (modified) (108 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-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-09 14:50+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 09:27+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-05-10 07:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:30+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -32 +32 @@
 msgstr "說明"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的檔案 URL： \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -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:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -76 +76 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -97 +97 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "參數「downloadgps」不能使用檔案名稱或檔案 URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119 +119 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -226 +226 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -243 +243 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -264 +264 @@
 #: ../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:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -276 +276 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -329 +330 @@
 msgstr "由經緯度新增節點"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -340 +350 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -397 +407 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -451 +461 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -460 +470 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -478 +489 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -546 +557 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "沒有選擇要縮放的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "縮放至 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "將檢視縮放至 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "檢視：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "沒有要縮放的衝突"
@@ -656 +667 @@
 msgstr "組合 {0} 條路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "請選擇至少兩個以上的路徑來合併"
@@ -702 +713 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -811 +822 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "下載物件"
@@ -854 +865 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -980 +991 @@
 msgstr "找不到交叉點。沒有東西變更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "在所有的交叉點加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "刪除不屬於內部多邊形一部分的路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "修正關係"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "已連結自我重疊的區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "已連結重疊的區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1006 +1017 @@
 msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "輸入所有衝突項目的數值。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "解決衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "修正標籤的衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "從關係中移除元件"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "連結區域：移除短路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "封閉的路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "移除內部路徑的標籤"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "連結區域功能"
@@ -1051 +1062 @@
 msgstr "連結節點與直線"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "沒有捷徑鍵"
@@ -1490 +1501 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../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:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1501 +1512 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1897 +1908 @@
 msgstr "復原最後的動作。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "取消全選"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "取消選擇所有的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "取消全選（焦點）"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "取消全選（跳出）"
@@ -2029 +2047 @@
 msgstr "切換線框檢視"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "拉近"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "拉起"
@@ -2250 +2264 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2269 +2283 @@
 "Ctrl：刪除參考的物件。"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
 msgid "Draw"
 msgstr "繪製"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "繪製節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "模式：繪製焦點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "不能在這個世界以外的地方加入節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "將節點加入路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "將既存的路徑連接到節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "在既存的路徑加入新的節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "將節點加入路徑並連接"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "建立新的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "選取游標下的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2322 +2336 @@
 msgstr[0] "插入新的節點到{0} 路徑中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "從最後的節點開始新的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "從最後的節點繼續路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "結束繪製。"
@@ -2870 +2884 @@
 msgstr "加入關係 {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3731 +3745 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "已選取"
@@ -3760 +3774 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "背景"
@@ -3842 +3856 @@
 msgstr "PUWG 區"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (波蘭)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3942 +3956 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4057 +4071 @@
 msgstr "參數「{0}」應為非空的數值，卻收到「{1}」"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "上傳偏好設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "將目前的偏好設定上傳到伺服器"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "字串"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "使用者的名稱。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM 密碼。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "將小程式重設為指定的大小（格式：寬x高）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "字串;字串;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4097 +4111 @@
 "下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4105 +4119 @@
 "案名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4112 +4126 @@
 "加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "任何"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "如果指定，會重設組態而非讀取它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "使用者名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "顯示此說明訊息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "標準 unix 幾何引數"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "下載此綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "開啟檔案（任何可以使用 檔案/開啟 來開啟的檔案類型）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "下載綁定方塊做為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "將 url (lat=x&lon=y&zoom=z) 的位置下載為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "選取指定的搜尋"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "以最大化模式啓動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "重設偏好設定為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "設定語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "選項提供為 Java 系統屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "改變所有使用者設定值的資料夾"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4204 +4218 @@
 "      Java 選項以 MB 來指定分配到記憶體的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "範例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4214 +4228 @@
 msgstr "參數 --download、 --downloadgps  和 --selection 會以這個順序處理。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用 --selection 請確定已載入某些資料。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "初始化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "正在更新外掛程式..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "正在安裝更新的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "載入較早的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "設定預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "建立主視窗中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "正在載入外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4257 +4271 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4379 +4393 @@
 msgstr "使用者："
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "圖層不在清單中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4802 +4816 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../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
@@ -5036 +5050 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5042 +5056 @@
 "you agree?</html>"
 msgstr ""
-"<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在下次"
-"上傳時伺服器會重新<br>指派新的 id 給它。<br>您是否同意？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5289 +5301 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5298 +5310 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5586 +5598 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5659 +5671 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "重新載入"
@@ -5713 +5725 @@
 msgstr "重製這個圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "將選取的圖層上移一列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "將選取的圖層下移一列。"
@@ -6841 +6853 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7476 +7488 @@
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "删除屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "選擇主要選擇區域的關係。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8164 +8176 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8194 +8206 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "空指標例外(Null pointer exception)，可能遺漏某些標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "搜尋 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "點選以開始搜尋位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "查詢名稱伺服器"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "查詢名稱伺服器..."
@@ -8230 +8242 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8242 +8254 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8276 +8288 @@
 msgstr "拼貼數"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "讀取 CSS 檔案 ''help-browser.css'' 失敗。例外為：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM 協助文件瀏覽器"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8302 +8314 @@
 "英語版本</a>。</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8600 +8612 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "選取的衝突"
@@ -9346 +9358 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "正在上傳 {0} 個物件..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9503 +9518 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "gps 點"
@@ -9666 +9682 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9727 +9743 @@
 msgstr "資料圖層 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "超出下載的區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9747 +9763 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9759 +9775 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9770 +9786 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9782 +9798 @@
 msgstr[0] "{0} 已刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} 組成："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "取消設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API 版本： {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "轉換為 GPX 圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9848 +9864 @@
 msgstr[0] "{0} 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10132 +10144 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
@@ -10154 +10166 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "從磁碟刪除圖片檔"
@@ -10184 +10196 @@
 msgstr "檔案 {0} 有錯誤"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "上一幅"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "顯示前一張圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "從圖層移除相片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "下一幅"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "顯示下一張圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "置中檢視"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "最適與 1:1 縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10243 +10255 @@
 "高度： {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10306 +10318 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "顯示/隱藏文字/圖示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11114 +11125 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "繪畫樣式 {0}：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "選擇"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "選擇 {0} 的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "設為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "全部設為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "在 JOSM 中用於不同物件的顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "顏色"
@@ -11585 +11596 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "已停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "沒有修飾鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">鍵盤捷徑鍵</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11603 +11614 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11612 +11623 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11627 +11638 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>修飾鍵群組</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11640 +11651 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11647 +11658 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "請先閱讀"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "使用預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "按鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "注意：只使用真實的鍵盤按鍵！"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "編輯捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "第一修飾鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "第二修飾鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "第三修飾鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "選單捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "熱鍵捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "子視窗捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "修飾鍵群組"
@@ -11767 +11778 @@
 msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "顯示坐標為"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "投影方法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "投影法代碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "地圖投影"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11826 +11837 @@
 msgstr "手動改變鍵盤捷徑鍵。"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "動作"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "捷徑鍵"
@@ -12304 +12314 @@
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12330 +12339 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "改變屬性"
@@ -12851 +12860 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14127 +14129 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14138 +14140 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14146 +14148 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14155 +14157 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "（提示：您可以在偏好設定中編輯捷徑鍵。）"
@@ -14523 +14525 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14550 +14552 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14731 +14733 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "選擇目標圖層"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15292 +15293 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "選用性的"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15321 +15321 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "測量"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16775 +16774 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "物件歷史紀錄"
+msgid "Revert"
+msgstr "重新設定"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "History reverter"
-msgstr "歷史記錄項目"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "準備 OSM 資料..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "開放的變更組合"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "要求的：{0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "關係..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "變更組合 {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17036 +17037 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17110 +17110 @@
 msgstr "未預期的欄號 {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "標籤預設組合測試程式"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr "開啟標籤預設組合測試工具以預覽標籤預設組合對話盒。"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "您必須先在偏好設定中指定標籤預設組合來源。"
@@ -17965 +17965 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "如果資料要下載到新的圖層裡請選擇此項"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "輸入要下載的物件 ID"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "開始下載"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "關閉對話盒並取消下載"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "檔案: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "正在載入 {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "節點 {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18763 +18755 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "影片類"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19173 +19175 @@
 msgstr "您必須將自己的編輯設為公開才能上傳新的資料"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "下"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19367 +19375 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "執行對話盒以查詢變更組合"
+msgstr ""
 
 #. Plugin routes
@@ -19444 +19451 @@
 "籤名稱的拼字檢查。"
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19452 +19467 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19469 +19484 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31929 +31944 @@
 msgstr ""
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "正在上傳 {0} 個物件..."
+
 #~ msgid "Open in Browser"
 #~ msgstr "在瀏覽器中打開"