Changeset 21414 in osm for applications/editors/josm/i18n/po/ja.po

Timestamp:

2010-05-22T23:50:00+02:00 (14 years ago)

Author:

stoecker

Message:

i18n update

File:

• applications/editors/josm/i18n/po/ja.po (modified) (103 diffs)

applications/editors/josm/i18n/po/ja.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-16 13:43+0200\n"
-"PO-Revision-Date: 2010-05-12 22:09+0000\n"
+"POT-Creation-Date: 2010-05-22 23:46+0200\n"
+"PO-Revision-Date: 2010-05-19 11:34+0000\n"
 "Last-Translator: ribbon <Unknown>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-05-16 10:34+0000\n"
+"X-Launchpad-Export-Date: 2010-05-22 21:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -27 +27 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:317
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:320
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -231 +231 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:286
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
@@ -251 +250 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
@@ -267 +267 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
@@ -333 +333 @@
 
 #. modal
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121
 msgid "Add Node..."
 msgstr "ノードを追加..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
 msgid "Add a node by entering latitude and longitude."
 msgstr "緯度経度を指定して、ノードを追加"
@@ -352 +352 @@
 #. * for now this is a reasonable approximation.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
@@ -371 +371 @@
 msgid "Edit: {0}"
 msgstr "編集: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:101
-msgid "Enter the coordinates for the new node."
-msgstr "新しいノードの座標を入力してください"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102
-msgid "Use decimal degrees."
-msgstr "十進経緯度を使う。"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103
-msgid "Negative values denote Western/Southern hemisphere."
-msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../plugins/grid/src/grid/GridLayer.java:193
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-msgid "Latitude"
-msgstr "緯度"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../plugins/grid/src/grid/GridLayer.java:195
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-msgid "Longitude"
-msgstr "経度"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:223
-msgid "Please enter a valid latitude in the range -90..90"
-msgstr "-90から90の範囲で正しい緯度を入力してください"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:226
-msgid "Please enter a latitude in the range -90..90"
-msgstr "-90から90の範囲で緯度を入力してください"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:234
-msgid "Please enter a valid longitude in the range -180..180"
-msgstr "-180から180の範囲で正しい経度を入力してください"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:237
-msgid "Please enter a longitude in the range -180..180"
-msgstr "-180から180の範囲で経度を入力してください"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:273
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../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:384
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
-#: ../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
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:299
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
-msgid "Close the dialog and create a new node"
-msgstr "ダイアログを閉じて新しいノードを作成"
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
-msgid "Close the dialog, do not create a new node"
-msgstr "ダイアログを閉じて、新しいノードを作成しない"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
@@ -726 +650 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:370
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
 #: ../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:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:637
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
@@ -1102 +1026 @@
 msgstr "www.openstreetmap.orgから、URLを貼り付けることもできます。"
 
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
+#: ../plugins/grid/src/grid/GridLayer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
+msgid "Latitude"
+msgstr "緯度"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
+#: ../plugins/grid/src/grid/GridLayer.java:195
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
+msgid "Longitude"
+msgstr "経度"
+
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
 msgid "Zoom (in metres)"
@@ -1233 +1171 @@
 msgstr "オブジェクトを世界の外に移動できません。"
 
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
+#, fuzzy
+msgid "Move Node..."
+msgstr "ノードを追加..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
+#, fuzzy
+msgid "Edit latitude and longitude of a node."
+msgstr "緯度経度を指定して、ノードを追加"
+
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
-msgid "New"
-msgstr "新規"
+#, fuzzy
+msgid "New Layer"
+msgstr "レイヤーを保存"
 
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-msgid "Create a new map."
+#, fuzzy
+msgid "Create a new map layer."
 msgstr "新しい地図を作成します。"
 
@@ -1487 +1434 @@
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:390
 msgid "Redo"
 msgstr "やり直し"
@@ -1529 +1477 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:625
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
@@ -1946 +1894 @@
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:384
 msgid "Undo"
 msgstr "取り消し"
@@ -2443 +2392 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:320
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:311
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
@@ -2766 +2716 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285
 msgid "Search"
 msgstr "検索"
@@ -2943 +2893 @@
 msgstr "循環依存"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231
+#: ../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:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../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
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:299
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65
 #, java-format
 msgid "Add node {0}"
 msgstr "ノード {0} を追加"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
 msgid "Add way {0}"
 msgstr "ウェイ {0} を追加"
 
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
 #, java-format
 msgid "Add relation {0}"
 msgstr "リレーション {0} を追加"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:58
 #, java-format
 msgid "Added {0} object"
@@ -2964 +2940 @@
 msgstr[0] "{0} 個のオブジェクトを追加しました"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:55
 #, java-format
 msgid "Change node {0}"
 msgstr "ノード {0} を変更"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:56
 #, java-format
 msgid "Change way {0}"
 msgstr "ウェイ {0} を変更"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:59
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
 #, java-format
 msgid "Change relation {0}"
 msgstr "リレーション {0} を変更"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeNodesCommand.java:51
+#: ../core/src/org/openstreetmap/josm/command/ChangeNodesCommand.java:49
 #, java-format
 msgid "Changed nodes of {0}"
@@ -3024 +3000 @@
 msgstr "{2} オブジェクトについて、{0}={1}を設定"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
 #, java-format
 msgid "Change relation member role for {0} {1}"
 msgstr "リレーションのメンバー{0}のロールを {1} に変更"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30
 #, java-format
 msgid ""
@@ -3038 +3014 @@
 "す。この競合は加えることができません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
 msgid "Double conflict"
 msgstr "二重の競合"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52
 #, java-format
 msgid ""
@@ -3052 +3028 @@
 "せん。"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67
 #, java-format
 msgid "Add conflict for ''{0}''"
@@ -3058 +3034 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:208
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84
 #, java-format
 msgid ""
@@ -3066 +3042 @@
 "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません"
 
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:42
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
@@ -3072 +3048 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:63
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:74
 msgid "Cannot resolve undecided conflict."
 msgstr "未決の競合を解決できません"
@@ -3084 +3060 @@
 "ました"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete node {0}"
 msgstr "ノード {0} を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:160
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
 #, java-format
 msgid "Delete way {0}"
 msgstr "ウェイ {0} を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
 #, java-format
 msgid "Delete relation {0}"
 msgstr "リレーション {0} を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
 #, java-format
 msgid "Delete {0} object"
@@ -3105 +3081 @@
 msgstr[0] "{0} 個のオブジェクトを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} node"
@@ -3111 +3087 @@
 msgstr[0] "{0} 個のノードを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:181
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
 msgid "Delete {0} way"
@@ -3117 +3093 @@
 msgstr[0] "{0} 個のウェイを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
 #, java-format
 msgid "Delete {0} relation"
@@ -3123 +3099 @@
 msgstr[0] "{0} 個のリレーションを削除"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#, fuzzy, java-format
+msgid "Deleted ''{0}''"
+msgstr "ノード {0} を削除"
+
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:433
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
@@ -3136 +3117 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:441
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:459
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240
 msgid "Delete confirmation"
 msgstr "削除確認"
 
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
 msgstr "{0} 内の削除済み状態の競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:38
 #, java-format
 msgid "Set the ''modified'' flag for node {0}"
 msgstr "ノード{0}の\"修正中\"フラグを設定します。"
 
-#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:39
 #, java-format
 msgid "Set the ''modified'' flag for way {0}"
 msgstr "ウェイ{0}の\"修正中\"フラグを設定します。"
 
-#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:40
 #, java-format
 msgid "Set the ''modified'' flag for relation {0}"
 msgstr "関連{0}の\"修正中\"フラグを設定します。"
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:130
 #, java-format
 msgid "Move {0} node"
@@ -3168 +3149 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:119
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr "オブジェクト ''{0}'' を取り除いた。"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
 #, java-format
 msgid "Purged {0} object"
@@ -3178 +3160 @@
 msgstr[0] "{0}オブジェクトの削除"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:152
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:159
 #, java-format
 msgid ""
@@ -3187 +3169 @@
 "{1} です。"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:161
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:168
 #, java-format
 msgid "Removing reference from relation {0}"
 msgstr "リレーション {0} からリファレンスを削除する"
 
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:53
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
 msgstr "リレーション {0} のメンバーリスト内の競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:139
 #, java-format
 msgid "Rotate {0} node"
@@ -3203 +3185 @@
 msgstr[0] "{0} 個のノードを回転"
 
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:93
 msgid "Sequence"
 msgstr "シーケンス"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:64
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
 msgstr "ノード {1} の {0} タグ競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:65
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
 msgstr "ウェイ {1} の {0} タグ競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
 msgstr "リレーション {1} の {0} タグ競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64
 #, java-format
 msgid "Undelete {0} primitive"
@@ -3228 +3210 @@
 msgstr[0] "{0} 個のプリミティブの削除を取消す"
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38
 #, java-format
 msgid "Resolve version conflict for node {0}"
 msgstr "ノード {0} のバージョン競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:39
 #, java-format
 msgid "Resolve version conflict for way {0}"
 msgstr "ウェイ {0} のバージョン競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
 #, java-format
 msgid "Resolve version conflict for relation {0}"
 msgstr "リレーション {0} のバージョン競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:49
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
 msgstr "ウェイ {0} のノードリスト中の競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:66
 #, java-format
 msgid "Main dataset does not include node {0}"
@@ -3677 +3659 @@
 msgstr "</p><p>フィルタのダイアログを閉じて全オブジェクトを見る。<p></html>"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:488
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:489
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:545
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:546
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:547
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:548
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:767
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:768
 #, java-format
 msgid ""
@@ -3700 +3682 @@
 "は {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1139
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1140
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3708 +3690 @@
 "う一方は新規ではないためです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1141
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1142
 #, java-format
 msgid ""
@@ -3716 +3698 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:108
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
@@ -3735 +3717 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:373
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
@@ -4030 +4012 @@
 msgstr "次回から表示しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:84
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:285
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:294
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -4038 +4020 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:125
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:102
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:165
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:226
 msgid "incomplete"
 msgstr "不完全"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:348
 msgid "highway"
 msgstr "道路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:349
 #: build/trans_presets.java:3214
 msgid "railway"
 msgstr "鉄道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:341
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:350
 msgid "waterway"
 msgstr "水路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:342
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:351
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:147
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:347
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
 #: ../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/dialogs/SelectionListDialog.java:711
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
@@ -4077 +4059 @@
 msgstr[0] "{0} 個のノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:169
 msgid "public transport"
 msgstr "公共輸送機関"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:207
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:392
+#. color tiger_data
+#. </rule>
+#.
+#. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
+#. <rule>
+#. <condition k="openGeoDB:type" v="Stadt"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Kreis"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Gemeinde"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Ort"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="District"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:location" v="locality"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--annotation tags -->
+#.
+#. <!--"work in progress" tags -->
+#.
+#. <rule>
+#. <condition k="building"/>
+#. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
+#: build/trans_style.java:4292
+msgid "building"
+msgstr "建物"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:401
 #, java-format
 msgid "{0} member"
@@ -4088 +4130 @@
 msgstr[0] "{0}  個のメンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:242
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -4384 +4426 @@
 msgstr "設定 {0} はもう使われていないので、除かれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
 msgid "File"
 msgstr "ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
@@ -4403 +4445 @@
 msgstr "編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
 msgid "View"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4413 +4455 @@
 msgstr "ツール"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
 msgstr "プリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:197
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4427 +4469 @@
 msgstr "メニュー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:307
 msgid "Audio"
 msgstr "音声"
@@ -5196 +5238 @@
 "you agree?</html>"
 msgstr ""
+"<html>あなたのローカルバージョンを保持するために、JOSM<br>はプリミティブ {0} "
+"のIDを0にリセットしなければなりません。<br>次回アップロード時にサーバはこれに"
+"新しいIDを<br>割り当てます。<br>同意しますか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5441 +5486 @@
 
 #: ../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/dialogs/SelectionListDialog.java:707
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
@@ -5450 +5495 @@
 
 #: ../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/dialogs/SelectionListDialog.java:715
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
@@ -5630 +5675 @@
 msgstr "変更セットマネージャを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:242
 msgid "Command Stack"
 msgstr "指示の集積"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
 msgid "Open a list of all commands (undo buffer)."
 msgstr "全指示のリストを開く（取り消しバッファ）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
@@ -5646 +5691 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
@@ -5659 +5704 @@
 msgstr "トグル: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
-#, java-format
-msgid "Command Stack: {0}"
-msgstr "指示の集積: {0}"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:321
+msgid ""
+"Selects the objects that take part in this command (unless currently deleted)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:385
+#, fuzzy
+msgid "Undo the selected and all later commands"
+msgstr "選択中の経由地をクリップボードにコピー"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:391
+#, fuzzy
+msgid "Redo the selected and all earlier commands"
+msgstr "選択されたアイコンパスを削除"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
@@ -5682 +5737 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:312
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
 msgid ""
@@ -5825 +5880 @@
 msgstr "選択したオブジェクトの履歴を表示。"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:43
+#, fuzzy
+msgid "Advanced object info"
+msgstr "{0} 個のオブジェクトを追加しました"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
+msgid "Enter the coordinates for the new node."
+msgstr "新しいノードの座標を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+msgid "Use decimal degrees."
+msgstr "十進経緯度を使う。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+msgid "Negative values denote Western/Southern hemisphere."
+msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181
+msgid "Please enter a valid latitude in the range -90..90"
+msgstr "-90から90の範囲で正しい緯度を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184
+msgid "Please enter a latitude in the range -90..90"
+msgstr "-90から90の範囲で緯度を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192
+msgid "Please enter a valid longitude in the range -180..180"
+msgstr "-180から180の範囲で正しい経度を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195
+msgid "Please enter a longitude in the range -180..180"
+msgstr "-180から180の範囲で経度を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
+msgid "Close the dialog and create a new node"
+msgstr "ダイアログを閉じて新しいノードを作成"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
+msgid "Close the dialog, do not create a new node"
+msgstr "ダイアログを閉じて、新しいノードを作成しない"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5926 +6022 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:745
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:751
 msgid "Download incomplete members of selected relations"
 msgstr "選択されたリレーションの不完全なメンバーをダウンロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:747
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:753
 msgid "Download incomplete members"
 msgstr "不完全なメンバーをダウンロード"
@@ -5940 +6036 @@
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163
 msgid "Current Selection"
 msgstr "現在の選択範囲"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 msgid "Open a selection list window."
 msgstr "セレクションリスト　ウインドウを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:286
 msgid "Search for objects"
 msgstr "オブジェクトを検索"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
 msgid "Zoom to selection"
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:368
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:375
 msgid "Zoom to selected element(s)"
 msgstr "選択した要素にズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:429
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5970 +6066 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:440
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:711
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:717
 #, java-format
 msgid "Selection: {0}"
 msgstr "選択: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:788
+msgid "Get detailed information on the internal state of the objects."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:789
+#, fuzzy
+msgid "Inspect"
+msgstr "設定解除"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
@@ -9543 +9648 @@
 "editing.<br>"
 msgstr ""
+"''<strong>{0}</strong>'' をクリックして追加の新しい変更セットにアップロードを"
+"継続。<br> ''<strong>{1}</strong>'' をクリックしてアップロードダイアログに戻"
+"る。<br>''<strong>{2}</strong>'' をクリックしてアップロードを中断し、マップ編"
+"集に戻る。<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
@@ -10400 +10509 @@
 msgstr[0] "GPSタグが必要なものが {0}見つかりました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "ディスクから画像ファイルを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:599
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:639
 #, java-format
 msgid ""
@@ -10414 +10523 @@
 "に失われます。</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664
 msgid "Image file could not be deleted."
 msgstr "画像ファイルが削除できません。"
@@ -10501 +10610 @@
 "{0} km/h"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:242
+#, fuzzy, java-format
+msgid ""
+"\n"
+"Direction {0}°"
+msgstr "方向"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
 msgid "JPEG images (*.jpg)"
@@ -10558 +10674 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
 msgid "Show Text/Icons"
-msgstr ""
+msgstr "テキスト/アイコンを表示"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -10752 +10868 @@
 "(HTTPS)."
 msgstr ""
+"<strong>警告:</strong>パスワードは<strong>平文で</strong>OSM webサイトに転送"
+"されます。OSMサーバが暗号化した通信方式(HTTPS)を使うまで、重要なパスワードは"
+"決して<strong>使わないでください</strong>。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:173
@@ -10857 +10976 @@
 "<br><br>Please check username and password and try again.</html>"
 msgstr ""
+"<html>OSMサーバからのOAuthアクセストークン参照の自動手続きが<br>失敗しまし"
+"た。JOSM はユーザ {1} としての {0} へのログインに失敗しました。<br><br>ユーザ"
+"名とパスワードをチェックしてやり直してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -12185 +12307 @@
 msgstr "バージョン: {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624
+#: ../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
 msgid "Add a filename or an URL of an active style"
@@ -12367 +12495 @@
 "''{1}'' and your Internet connection and validate again.</html>"
 msgstr ""
+"<html>''{0}'' への接続に失敗。<br> ''{1}'' のスペルとインターネット接続を"
+"チェックして再認証してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
@@ -12443 +12573 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
 msgid "Warning: failed to retrieve OSM credentials from credential manager."
-msgstr ""
+msgstr "警告: 認証証明マネージャからのOSM認証証明参照に失敗。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
@@ -12455 +12585 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:139
 msgid "Warning: failed to save OSM credentials to credential manager."
-msgstr ""
+msgstr "警告: 認証証明マネージャへOSM認証証明の保存に失敗。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
 msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
-msgstr ""
+msgstr "警告: 認証証明マネージャからのOAuthトークン参照に失敗。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
 msgid "Warning: Failed to store OAuth Access Token to credentials manager"
-msgstr ""
+msgstr "警告: 認証証明マネージャへのOAuthトークンの保管に失敗。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:187
@@ -12500 +12630 @@
 msgid "Click test access to the OSM server with the current access token"
 msgstr ""
+"クリックして、現在のアクセストークンでOSMサーバにアクセスできるかをテストしま"
+"す"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:62
@@ -13539 +13671 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
 msgid "Missing key or value attribute in tag."
-msgstr ""
+msgstr "タグ内のキーまたは値属性が見つかりません。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -13679 +13811 @@
 #, java-format
 msgid "Line {0} column {1}: "
-msgstr ""
+msgstr "ライン {0} カラム {1}: "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14234 +14366 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
+msgid "unspecified reason"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:348
 msgid "Error playing sound"
 msgstr "サウンドの再生でエラーが発生しています"
@@ -14530 +14666 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:354
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:355
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14979 +15115 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
 msgid "House number:"
-msgstr ""
+msgstr "家番号:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
@@ -15277 +15413 @@
 msgstr "水域(湖沼)"
 
-#. color tiger_data
-#. </rule>
-#.
-#. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
-#. <rule>
-#. <condition k="openGeoDB:type" v="Stadt"/>
-#. <icon annotate="true" src="place/settlement/town.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="openGeoDB:type" v="Kreis"/>
-#. <icon annotate="true" src="place/settlement/town.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="openGeoDB:type" v="Gemeinde"/>
-#. <icon annotate="true" src="place/settlement/town.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="openGeoDB:type" v="Ort"/>
-#. <icon annotate="true" src="place/settlement/town.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="openGeoDB:type" v="District"/>
-#. <icon annotate="true" src="place/settlement/town.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="openGeoDB:location" v="locality"/>
-#. <icon annotate="true" src="place/settlement/town.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--annotation tags -->
-#.
-#. <!--"work in progress" tags -->
-#.
-#. <rule>
-#. <condition k="building"/>
-#. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4292
-msgid "building"
-msgstr "建物"
-
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 msgid "symbol"
@@ -15402 +15479 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
 msgid "section"
-msgstr ""
+msgstr "セクション"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
@@ -15761 +15838 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
 msgid "I use the mouse"
-msgstr ""
+msgstr "マウスを使います"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -17319 +17396 @@
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
-#, fuzzy
 msgid "Reverting..."
-msgstr "リレーション ..."
+msgstr ""
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
@@ -17766 +17842 @@
 msgstr "最低4ノード以上の単一のクローズドウェイを選択"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:286
+#: ../plugins/terracer/src/terracer/TerracerAction.java:288
 msgid "Terrace"
 msgstr "テラスハウス"
@@ -19294 +19370 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:107
 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
@@ -19737 +19807 @@
 #. use has not made edits public
 #: build/specialmessages.java:12
-#, fuzzy
 msgid "town"
-msgstr "下"
+msgstr ""
+
+#. Nominatim search place type
+#. color basin
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="forest"/>
+#: build/specialmessages.java:13 build/trans_style.java:3228
+msgid "forest"
+msgstr "森"
 
 #. Plugin AddrInterpolation
@@ -23169 +23251 @@
 #: build/trans_presets.java:1330
 msgid "Esso"
-msgstr ""
+msgstr "エッソ"
 
 #: build/trans_presets.java:1330
@@ -23435 +23517 @@
 #: build/trans_presets.java:1334
 msgid "Fuel types:"
-msgstr ""
+msgstr "燃料の種類:"
 
 #. item "Car/Fuel" label "Fuel types:"
 #: build/trans_presets.java:1335
 msgid "Diesel"
-msgstr ""
+msgstr "ディーゼル"
 
 #. item "Car/Fuel" check "Diesel"
 #: build/trans_presets.java:1336
 msgid "Bio Diesel"
-msgstr ""
+msgstr "バイオ燃料(ディーゼル)"
 
 #. item "Car/Fuel" check "Bio Diesel"
@@ -23490 +23572 @@
 #: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
+msgstr "LPGガス"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
-msgstr ""
+msgstr "天然ガス"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
@@ -23842 +23924 @@
 #: build/trans_presets.java:1519
 msgid "Runway"
-msgstr ""
+msgstr "滑走路"
 
 #. item "Airport/Runway"
@@ -23848 +23930 @@
 #: build/trans_presets.java:1521
 msgid "Edit Runway"
-msgstr ""
+msgstr "滑走路の編集"
 
 #. item "Airport/Runway" text "Reference"
@@ -23854 +23936 @@
 #: build/trans_presets.java:1527
 msgid "Taxiway"
-msgstr ""
+msgstr "誘導路"
 
 #. item "Airport/Taxiway"
@@ -23860 +23942 @@
 #: build/trans_presets.java:1529
 msgid "Edit Taxiway"
-msgstr ""
+msgstr "誘導路の編集"
 
 #. item "Airport/Taxiway" text "Reference"
@@ -23880 +23962 @@
 #: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
-msgstr ""
+msgstr "エプロン"
 
 #. item "Airport/Apron" label "Apron"
@@ -23888 +23970 @@
 #: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
-msgstr ""
+msgstr "格納庫"
 
 #. item "Airport/Hangar" label "Hangar"
@@ -23906 +23988 @@
 #: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
-msgstr ""
+msgstr "吹き流し"
 
 #. item "Airport/Windsock" label "Windsock"
@@ -23913 +23995 @@
 #: build/trans_presets.java:1564
 msgid "Terminal"
-msgstr ""
+msgstr "ターミナル"
 
 #. item "Airport/Terminal"
@@ -23919 +24001 @@
 #: build/trans_presets.java:1566
 msgid "Edit Terminal"
-msgstr ""
+msgstr "ターミナルの編集"
 
 #. item "Airport/Gate"
@@ -23925 +24007 @@
 #: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
-msgstr ""
+msgstr "ターミナルゲートの編集"
 
 #. item "Airport/Gate" text "Reference"
@@ -24123 +24205 @@
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
-msgstr ""
+msgstr "サンドイッチ"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
-msgstr ""
+msgstr "寿司"
 
 #: build/trans_presets.java:1638
@@ -24145 +24227 @@
 #: build/trans_presets.java:1643
 msgid "chicken"
-msgstr ""
+msgstr "チキン"
 
 #: build/trans_presets.java:1646
@@ -31529 +31611 @@
 msgstr "水たまり、窪地"
 
-#. color basin
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3228
-msgid "forest"
-msgstr "森"
-
 #. color residential
 #. <icon src="misc/landuse/residential.png"/>
@@ -32532 +32602 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "Uploading {0} objects ..."
-#~ msgstr "{0} オブジェクトをアップロード中 ..."
-
-#~ msgid "GPS point"
-#~ msgstr "GPS ポイント"
+#~ msgid "Command Stack: {0}"
+#~ msgstr "指示の集積: {0}"
 
 #~ msgid "Move"
@@ -34064 +34131 @@
 #~ msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "{0} オブジェクトをアップロード中 ..."
+
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "パラメータ ''{0}'' は空ではダメです"
@@ -34180 +34250 @@
 #~ msgstr "ノード {0} は削除済みなのでウェイに追加できません"
 
+#~ msgid "GPS point"
+#~ msgstr "GPS ポイント"
+
 #~ msgid "Exec"
 #~ msgstr "実行"