Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 25886)
+++ applications/editors/josm/i18n/po/ja.po	(revision 26037)
@@ -8,15 +8,14 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-23 22:56+0200\n"
-"PO-Revision-Date: 2011-04-23 09:08+0000\n"
-"Last-Translator: ribbon <Unknown>\n"
+"POT-Creation-Date: 2011-05-22 23:30+0200\n"
+"PO-Revision-Date: 2011-05-06 16:56+0000\n"
+"Last-Translator: nori_u <Unknown>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2011-04-23 20:30+0000\n"
-"X-Generator: Launchpad (build 12883)\n"
+"X-Launchpad-Export-Date: 2011-05-22 19:26+0000\n"
+"X-Generator: Launchpad (build 13085)\n"
 "X-Poedit-Country: JAPAN\n"
 "X-Poedit-Language: Japanese\n"
@@ -29,6 +28,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:609
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:357
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:188
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:359
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -73,5 +72,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:317
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
@@ -81,5 +80,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:425
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:657
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
@@ -92,9 +91,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:130
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:133
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:210
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:51
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:353
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:662
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -148,6 +148,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:333
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:376
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:335
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:378
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
@@ -164,8 +164,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:953
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:842
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:535
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:692
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:568
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
@@ -178,5 +178,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:221
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:66
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:117
@@ -248,6 +248,6 @@
 #: ../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:77
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:218
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:228
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:818
@@ -287,6 +287,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:32
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:542
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:553
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -325,4 +325,6 @@
 "page for OSM object will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"警告:予期しない形式の、APIベースURL。OSMオブジェクトのinfoまたはhistoryページ"
+"へのリダイレクションは、おそらく失敗。APIベースのURLは: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -360,5 +362,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:157
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:224
@@ -373,8 +375,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:226
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -384,5 +386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:961
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1269
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -407,5 +409,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:665
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1406
@@ -419,4 +421,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/MyDialog.java:17
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:54
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:1304
@@ -431,7 +434,4 @@
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:195
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:196
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:194
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:96
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:189
@@ -544,4 +544,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java:50
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
@@ -561,11 +562,13 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:38
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java:32
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:82
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:22
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:44
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57
 #: ../plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java:18
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
@@ -578,8 +581,8 @@
 #: ../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:73
+#: ../plugins/terracer/src/terracer/TerracerAction.java:71
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:218
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:27
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
 #: ../plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java:44
 #: ../plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java:45
@@ -594,5 +597,8 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java:26
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java:26
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:29
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:29
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:33
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:28
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java:25
 #, java-format
@@ -613,5 +619,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
@@ -627,5 +633,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:1021
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java:43
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:40
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:44
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 msgid "Information"
@@ -727,5 +733,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
@@ -866,5 +872,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:983
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656
@@ -926,14 +932,39 @@
 msgstr "地図データをOSMサーバからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:54
 msgid "Download object..."
 msgstr "オブジェクトをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:53
 msgid "Download OSM object by ID."
 msgstr "OSM オブジェクトをIDでダウンロード。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:66
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:83
+msgid "Object type:"
+msgstr "オブジェクト種別:"
+
+#. item "Nature/Wood" combo "Type" display value
+#. item "Nature/Forest" combo "Type" display value
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:68
+#: build/trans_presets.java:3835 build/trans_presets.java:3844
+msgid "mixed"
+msgstr "混合林"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:69
+msgid "Choose the OSM object type"
+msgstr "OSMオブジェクトタイプを選択"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:70
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:91
+msgid "Object ID:"
+msgstr "オブジェクトID:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:72
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "ダウンロードするオブジェクトのIDを入力"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:74
@@ -941,54 +972,90 @@
 msgstr "新規レイヤーを作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:71
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "新しいレイヤーにデータをダウンロードするなら選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
 #: ../plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java:31
 msgid "Download referrers"
 msgstr "リファラーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
 msgid "Select if the referrers of the object should be downloaded as well"
 msgstr "オブジェクトのリファラーも同様にダウンロードが必要な場合は選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:83
-msgid "Object type:"
-msgstr "オブジェクト種別:"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:58
-msgid "Choose the OSM object type"
-msgstr "OSMオブジェクトタイプを選択"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
-#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:91
-msgid "Object ID:"
-msgstr "オブジェクトID:"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:65
-msgid "Enter the ID of the object that should be downloaded"
-msgstr "ダウンロードするオブジェクトのIDを入力"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:81
+msgid ""
+"Object IDs can be separated by comma or space.<br/> Examples: <b><ul><li>1 2 "
+"5</li><li>1,2,5</li></ul><br/></b> In mixed mode, specify objects like this: "
+"<b>w123, n110, w12, r15</b><br/>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "オブジェクトをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:120
 msgid "Start downloading"
 msgstr "ダウンロードを開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:121
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:96
 msgid "Close dialog and cancel downloading"
 msgstr "ダイアログを閉じてダウンロードをキャンセル"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
-msgid "Invalid ID specified. Cannot download object."
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:136
+#, fuzzy
+msgid ""
+"Invalid ID list specified\n"
+" Cannot download object."
 msgstr "不正なIDが指定されました。オブジェクトをダウンロードできません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:170
+#, fuzzy
+msgid "Object could not be downloaded"
+msgid_plural "Some objects could not be downloaded"
+msgstr[0] "ファイルを削除できません！"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:171
+#, fuzzy, java-format
+msgid "One object could not be downloaded.<br>"
+msgid_plural "{0} objects could not be downloaded.<br>"
+msgstr[0] "画像ファイルが削除できません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:175
+msgid ""
+"The server replied with response code 404.<br>This usually means, the server "
+"does not know an object with the requested id."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:177
+#, fuzzy
+msgid "missing objects:"
+msgstr "小さなオブジェクトを削除中"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:202
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:462
+#, fuzzy
+msgid "Object deleted"
+msgid_plural "Objects deleted"
+msgstr[0] "オブジェクトは削除されました"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:204
+#, fuzzy, java-format
+msgid "One downloaded object is deleted."
+msgid_plural "{0} downloaded objects are deleted."
+msgstr[0] "ただ一つだけのノードが選択されています。"
+
+#. content.add(scroller);
+#. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:245
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:666
+#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
+msgid "Ok"
+msgstr "OK"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -1000,4 +1067,6 @@
 msgid "Download objects referring to one of the selected objects"
 msgstr ""
+"ダウンロードオブジェクトは選択されたオブジェクトのうちのどれかを参照していま"
+"す"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
@@ -1053,4 +1122,17 @@
 msgstr "アプリケーションを終了します。"
 
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:36
+msgid "Follow line"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:38
+msgid "Continues drawing a line that shares nodes with another line."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/FollowLineAction.java:40
+#, fuzzy
+msgid "Follow"
+msgstr "低い"
+
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:35
 msgid "Fullscreen view"
@@ -1112,5 +1194,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1290
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
@@ -1130,8 +1212,7 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:131
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:170
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:98
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:300
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:301
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:687
 #: build/specialmessages.java:69
@@ -1154,5 +1235,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:165
 msgid "Offset: "
-msgstr ""
+msgstr "オフセット: "
 
 #: ../core/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java:167
@@ -1449,4 +1530,6 @@
 "node."
 msgstr ""
+"マージする二つ以上のノードを選択するか、マージ先の近くのノードを選択してくだ"
+"さい。"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:175
@@ -1478,5 +1561,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected objects into another layer"
-msgstr ""
+msgstr "現在選択されているオブジェクトを他のレイヤ中に併合"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1754,4 +1837,6 @@
 "objects?"
 msgstr ""
+"コピーしたデータには不完全なオブジェクトが含まれています。 不完全なオブジェク"
+"トは貼り付け時に削除されます。 不完全なオブジェクトを除いて貼り付けますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
@@ -1898,5 +1983,5 @@
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:240
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:240
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1403
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1408
 #: build/specialmessages.java:76
 msgid "Save"
@@ -2012,5 +2097,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:237
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java:74
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1379
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1384
 msgid "Close"
 msgstr "閉じる"
@@ -2035,5 +2120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:259
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:78
 msgid "No, abort"
@@ -2063,5 +2148,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -2433,25 +2518,26 @@
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:21
 msgid "Viewport Following"
-msgstr ""
+msgstr "ビューポート追随"
 
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:23
 msgid "Enable/disable automatic moving of the map view to last placed node"
 msgstr ""
+"最後に追加したノードに合わせてマップ表示を自動的に移動する機能の切り替え"
 
 #: ../core/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java:24
 msgid "Toggle Viewport Following"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:99
+msgstr "ビューポート追随の切り替え"
+
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:97
 msgid "Wireframe View"
 msgstr "ワイヤー・フレーム表示"
 
 #. no icon
-#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:20
 msgid "Enable/disable rendering the map as wireframe only"
 msgstr "ワイヤーフレームだけのマップ描画を有効化／無効化"
 
-#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:21
 msgid "Toggle Wireframe view"
 msgstr "ワイヤー・フレーム表示切り替え"
@@ -2695,4 +2781,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:105
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:45
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:42
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:68
@@ -2749,14 +2836,14 @@
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:903
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:907
 msgid "Create new node."
 msgstr "新規ノードの作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Select node under cursor."
 msgstr "カーソルの下のノードを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:914
 #, java-format
 msgid "Insert new node into way."
@@ -2764,14 +2851,14 @@
 msgstr[0] "新規ノードを {0}このウェイに追加します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
 msgid "Start new way from last node."
 msgstr "新規ウェイを最後に操作したノードから開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:922
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:926
 msgid "Continue way from last node."
 msgstr "最後に操作したノードからウェイを継続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Finish drawing."
 msgstr "描画の完了"
@@ -2828,4 +2915,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java:55
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:100
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java:57
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
@@ -2960,9 +3048,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "Filter string:"
-msgstr ""
+msgstr "フィルタ文字列:"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "Search string:"
-msgstr ""
+msgstr "検索文字列:"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:143
@@ -3102,41 +3190,51 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid ""
-"<b>timestamp:</b>... -  objects with this timestamp "
-"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-msgstr ""
-"<b>timestamp:</b>... - 指定したタイムスタンプのオブジェクト "
-"(<b>2009-11-12T14:51:09Z</b>、<b>2009-11-12</b>　や <b>T14:51</b> 等)"
+"<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+msgstr ""
+"<b>timestamp:</b>... - 指定したタイムスタンプのオブジェクト (<b>2009-11-"
+"12T14:51:09Z</b>、<b>2009-11-12</b>　や <b>T14:51</b> 等)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid ""
+"<b>areasize:</b>... - closed ways with area between MIN and MAX m². "
+"(areasize:MIN-MAX or areasize:MAX)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - 変更されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b>- すべての不完全なオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - タグの無いオブジェクト全て"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+msgid "<b>closed</b> - all closed ways (a node is not considered closed)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -3144,5 +3242,5 @@
 "場合など）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -3152,10 +3250,10 @@
 "えてエスケープしてください。(<b>\\\"</b> 及び <b>\\\\</b>）。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
@@ -3167,18 +3265,18 @@
 msgstr "フィルター"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:303
 msgid "Search"
 msgstr "検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
 msgid "Submit filter"
 msgstr "フィルターを登録"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:225
 msgid "Start Search"
 msgstr "検索開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
 #, java-format
 msgid ""
@@ -3191,29 +3289,29 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
 msgid "Invalid search expression"
 msgstr "不正な検索拡張"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "\"{0}\"にマッチするものが見つからない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:416
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:416
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:418
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}'' を検索しましたが、選択からは何も取り除いていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "選択の中に \"{0}\" と一致するものは見つかりませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:428
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:430
 #, java-format
 msgid "Found {0} matches"
@@ -3221,5 +3319,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:461
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:463
 msgctxt "search"
 msgid "CS"
@@ -3227,5 +3325,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:464
 msgctxt "search"
 msgid "CI"
@@ -3233,5 +3331,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:464
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:466
 msgctxt "search"
 msgid "RX"
@@ -3239,10 +3337,10 @@
 
 #. all elements
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:468
 msgctxt "search"
 msgid "A"
 msgstr "A"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:51
 #, java-format
 msgid ""
@@ -3256,5 +3354,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:52
 #, java-format
 msgid ""
@@ -3267,5 +3365,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:264
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -3273,5 +3371,5 @@
 "ださい: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:450
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3280,36 +3378,37 @@
 "\"relation\"です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:638
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:665
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "予期しないトークンです。{0}を期待してましたが、{1}を受け取りました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:680
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "予想外のトークン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:664
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
 msgid "Missing parameter for OR"
 msgstr "ORのパラメータが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:716
 msgid "Missing operator for NOT"
 msgstr "NOTに対する演算子が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:696
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:723
 msgid "Primitive id expected"
 msgstr "プリミティブIDを期待"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:698
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:725
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:728
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731
 msgid "Range of numbers expected"
 msgstr "予期される数字の範囲"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:734
 msgid "Changeset id expected"
 msgstr "変更セットIDを期待"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:706
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:736
 msgid "Version expected"
 msgstr "バージョンを期待"
@@ -3379,10 +3478,14 @@
 "inspect them."
 msgstr ""
+"以下は自動検証の結果です。注意深くそれらを修正することを試みてください(有効な"
+"データを消さないように)。それらについて疑問がある場合は無視してください。<BR>"
+"このダイアログをキャンセルすると、検証サイドパネルでエントリを探すことができ"
+"ます。"
 
 #. * Error messages
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:120
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:569
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:567
 msgid "Errors"
 msgstr "エラー"
@@ -3418,5 +3521,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:135
 msgid "Supicious data found. Upload anyway?"
-msgstr ""
+msgstr "疑わしいデータが見つかりましたがアップロードしますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java:136
@@ -3734,6 +3837,5 @@
 msgid "Undelete {0} object"
 msgid_plural "Undelete {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0}個のオブジェクトを元に戻す"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38
@@ -4052,5 +4154,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:317
 #, java-format
 msgid ""
@@ -4058,5 +4160,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:725
 #, java-format
 msgid ""
@@ -4120,5 +4222,5 @@
 #, java-format
 msgid "Cannot add a way with only {0} nodes."
-msgstr ""
+msgstr "{0}ノードのウェイは追加できません。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:163
@@ -4128,5 +4230,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java:195
 msgid "There is an intersection between ways."
-msgstr ""
+msgstr "ウェイが交差しています。"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:455
@@ -4153,5 +4255,5 @@
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1393
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1416
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -4161,5 +4263,5 @@
 "う一方は新規ではないためです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1395
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1418
 #, java-format
 msgid ""
@@ -4170,5 +4272,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:51
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
 msgid "node"
 msgid_plural "nodes"
@@ -4187,6 +4289,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:75
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:229
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:429
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:345
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:532
 msgid "relation"
 msgid_plural "relations"
@@ -4228,4 +4330,53 @@
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:108
+#, java-format
+msgid ""
+"Error: failed to load map renderer class ''{0}''. The class wasn''t found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:144
+#, java-format
+msgid ""
+"Can''t activate map renderer class ''{0}'', because the class wasn''t found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:145
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:149
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:155
+msgid "Activating the standard map renderer instead."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:148
+#, java-format
+msgid ""
+"Can''t activate map renderer class ''{0}'', because it isn''t a subclass of "
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:154
+#, java-format
+msgid ""
+"Can''t activate map renderer class ''{0}'', because it isn''t registered as "
+"map renderer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:166
+#, fuzzy
+msgid "Wireframe Map Renderer"
+msgstr "ワイヤー・フレーム表示"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:167
+msgid "Renders the map as simple wire frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:171
+msgid "Styled Map Renderer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java:172
+msgid "Renders the map using style rules in a set of style sheets."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
@@ -4268,5 +4419,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "背景"
@@ -4455,16 +4606,20 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:14
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:16
 msgid "validation error"
 msgstr "妥当性検証のエラー"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:16
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:20
 msgid "validation warning"
 msgstr "妥当性検証の警告"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Severity.java:18
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:24
 msgid "validation other"
 msgstr "その他を検証"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/Test.java:100
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Check.java:92
 #, java-format
 msgid "Running test {0}"
@@ -4524,5 +4679,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:108
 msgid "Duplicated nodes."
-msgstr ""
+msgstr "重複したノード。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java:109
@@ -4595,5 +4750,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:161
 msgid "Duplicated relations"
-msgstr ""
+msgstr "重複したリレーション"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:141
@@ -4605,13 +4760,13 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:170
 msgid "Relations with same members"
-msgstr ""
+msgstr "同じメンバを含むリレーション"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java:252
 msgid "Delete duplicate relations"
-msgstr ""
+msgstr "重複したリレーションを削除"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:88
 msgid "Duplicated ways."
-msgstr ""
+msgstr "重複したウェイ。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:89
@@ -4627,5 +4782,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:130
 msgid "Ways with same position"
-msgstr ""
+msgstr "同じ位置を持つウェイ"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java:225
@@ -4838,5 +4993,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:41
 msgid "Similarly named ways."
-msgstr ""
+msgstr "同じような名前のウェイ"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java:42
@@ -4963,5 +5118,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:590
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1010
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1016
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:128
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:731
@@ -4969,5 +5124,4 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:106
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:308
 msgid "Add"
 msgstr "追加"
@@ -4982,14 +5136,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java:606
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:137
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:483
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:802
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1054
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:804
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1056
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:272
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:147
@@ -5249,5 +5403,5 @@
 #. color building
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java:104
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:221
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:335
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: build/trans_style.java:3568
@@ -5297,5 +5451,5 @@
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:39
 msgid "Untagged and unconnected nodes."
-msgstr ""
+msgstr "タグ付けされていない、かつ、接続されていないノード。"
 
 #: ../core/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java:40
@@ -5400,7 +5554,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java:84
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:346
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:88
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:448
 #, java-format
 msgid " [id: {0}]"
@@ -5438,14 +5592,14 @@
 msgstr "次回から表示しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:149
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:278
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:162
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:238
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:253
 msgid "incomplete"
 msgstr "不完全"
 
 #. I18n: name of house as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:171
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184
 #, java-format
 msgid "House {0}"
@@ -5454,6 +5608,6 @@
 #. I18n: house number, street as parameter, number should remain
 #. before street for better visibility
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:123
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:191
 #, java-format
 msgid "House number {0} at {1}"
@@ -5461,29 +5615,29 @@
 
 #. I18n: house number as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:126
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:182
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:195
 #, java-format
 msgid "House number {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:161
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:400
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:502
 msgid "highway"
 msgstr "道路"
 
 #. item "Relations/Route" combo "Route type" display value
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:162
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:401
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:175
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:503
 #: build/trans_presets.java:4138
 msgid "railway"
 msgstr "鉄道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:402
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:176
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:504
 msgid "waterway"
 msgstr "水路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:403
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:177
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:505
 msgid "landuse"
 msgstr "土地利用"
@@ -5492,10 +5646,10 @@
 #. nevertheless, who knows what future brings
 #. I18n: count of nodes as parameter
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:196
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:408
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:210
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:510
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:432
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:266
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} node"
@@ -5503,10 +5657,6 @@
 msgstr[0] "{0} 個のノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:216
-msgid "public transport"
-msgstr "公共輸送機関"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:268
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:457
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:250
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:560
 #, java-format
 msgid "{0} member"
@@ -5514,5 +5664,9 @@
 msgstr[0] "{0}  個のメンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:294
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:330
+msgid "public transport"
+msgstr "公共輸送機関"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:396
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -5583,8 +5737,4 @@
 msgstr "不明なホスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:462
-msgid "Object deleted"
-msgstr "オブジェクトは削除されました"
-
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:111
@@ -5611,10 +5761,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:73
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:186
 msgid "Imagery"
 msgstr "画像"
 
 #: ../core/src/org/openstreetmap/josm/gui/ImageryMenu.java:92
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:117
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:94
 msgid "Blank Layer"
@@ -5712,69 +5862,69 @@
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Download the bounding box"
 msgstr "境界囲みをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "(lat=x&lon=y&zoom=zがついた)URLで示される場所の生gpsをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "Set the language"
 msgstr "言語の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -5787,9 +5937,9 @@
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -5798,50 +5948,50 @@
 "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Make sure you load some data if you use --selection."
 msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:193
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:203
 msgid "Initializing"
 msgstr "初期化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Updating plugins..."
 msgstr "プラグイン更新中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Installing updated plugins"
 msgstr "更新されたプラグインをインストール中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:218
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:212
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:222
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:217
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:224
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:234
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:263
 msgid "Unsaved osm data"
 msgstr "未保存のOSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
 msgid "Restore"
 msgstr "復元"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:264
 #: ../plugins/pdfimport/src/pdfimport/LoadPdfDialog.java:250
 msgid "Discard"
 msgstr "破棄"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:267
 #, java-format
 msgid "JOSM found {0} unsaved osm data layer. "
@@ -5849,14 +5999,16 @@
 msgstr[0] "まだセーブしていないデータレイヤ{0}1があります。 "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:259
-msgid "It looks like JOSM crashed last time. Do you like to restore the data?"
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:269
+#, fuzzy
+msgid ""
+"It looks like JOSM crashed last time. Would you like to restore the data?"
 msgstr "前回JOSMが異常終了したように見えます。データをリストアしますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:306
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "設定 {0} はもう使われていないので、除かれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
 #: ../plugins/smed/src/smed/menu/SmedMenuBar.java:41
 msgid "File"
@@ -5864,10 +6016,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:180
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
 #: build/specialmessages.java:87
 msgid "View"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:181
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:183
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/pdfimport/src/pdfimport/PdfImportPlugin.java:26
@@ -5875,5 +6027,5 @@
 msgstr "ツール"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:184
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:198
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -5881,5 +6033,5 @@
 msgstr "プリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:222
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:50
@@ -5890,5 +6042,5 @@
 msgstr "メニュー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:344
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:346
 msgid "Audio"
 msgstr "音声"
@@ -5999,13 +6151,13 @@
 msgstr "レイヤー ''{0}'' はレイヤーのリスト中になければなりません"
 
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1211
+msgid "Metric"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1212
-msgid "Metric"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1213
 msgid "Chinese"
 msgstr "中国語"
 
-#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:1213
 msgid "Imperial"
 msgstr ""
@@ -6086,5 +6238,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -6299,5 +6451,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
 msgid "Merging deleted objects failed"
-msgstr ""
+msgstr "削除されたオブジェクトの併合に失敗"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
@@ -6442,8 +6594,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:194
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:465
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:781
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:783
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1035
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/RemoveAddressTagsAction.java:26
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:284
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:155
@@ -6646,5 +6797,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:73
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:140
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:102
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -6662,5 +6814,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:76
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:140
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:105
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
@@ -6747,5 +6900,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 #: ../plugins/smed/src/smed/menu/file/TabManager.java:308
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:180
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:181
 msgid "none"
 msgstr "なし"
@@ -6834,6 +6987,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:807
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} way"
@@ -6843,5 +6996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:815
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} relation"
@@ -7042,7 +7195,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:175
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
@@ -7050,4 +7203,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java:48
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:78
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 #: ../plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java:127
@@ -7094,4 +7248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:330
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:115
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:101
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
@@ -7129,4 +7284,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:671
 msgid "Conflict not resolved completely"
 msgstr "競合は完全には解決されていません"
@@ -7281,5 +7437,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:909
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:911
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
@@ -7356,5 +7512,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1390
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:1394
 msgid "Show/Hide"
 msgstr "表示/非表示"
@@ -7405,9 +7561,9 @@
 msgstr "このレイヤは現在アクティブではありません（クリックしてアクティブに）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:881
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:885
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:902
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:906
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
@@ -7417,99 +7573,99 @@
 msgstr "レイヤーについての情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:48
 msgid "Map Paint Styles"
 msgstr "地図塗りつぶしスタイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:85
 msgid "configure the map painting style"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:86
 msgid "MapPaint"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:315
 msgid "Turn selected styles on or off"
 msgstr "選択したスタイルの適用を切替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row down."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:850
+msgstr "選択した行を下に移動"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:852
 msgid "Move the selected entry one row up."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:383
+msgstr "選択した行を上に移動"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:387
 msgid "Reload from file"
 msgstr "ファイルから再読み込み"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:388
 msgid "reload selected styles from file"
 msgstr "選択したスタイルをファイルから再読み込み"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:436
 msgid "Save as..."
 msgstr "名前を付けて保存..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:433
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:437
 msgid "Save a copy of this Style to file and add it to the list"
 msgstr "このスタイルのコピーをファイルに保存し、一覧に追加します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:478
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:223
 msgid "Reloading style sources"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:487
+msgstr "スタイルのソースを再読み込み中"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:491
 #, java-format
 msgid "Save style ''{0}'' as ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:535
 msgid "view meta information, error log and source definition"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:554
+msgstr "メタ情報とエラーログおよびソース定義を表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:546
 msgid "Map Style info"
 msgstr "マップスタイル情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:573
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
 msgid "Source"
 msgstr "情報ソース"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:605
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:597
 msgid "Title:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:607
+msgstr "タイトル:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:599
 msgid "URL:"
 msgstr "URL:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:601
 msgid "Built-in Style, internal path:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
+msgstr "ビルトインスタイルの内部パス:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:603
 msgid "Path:"
 msgstr "パス名："
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:606
 msgid "Icon:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:617
+msgstr "アイコン:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:609
 msgid "Background:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619
+msgstr "背景色:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
 msgid "Style is currently active?"
 msgstr "このスタイルを利用中？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:619
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java:611
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
@@ -7519,24 +7675,24 @@
 
 #. group "Relations"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:92
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:769
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:762
 #: build/trans_presets.java:4084
 msgid "Relations"
 msgstr "リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
 msgid "Open a list of all relations."
 msgstr "全てのリレーションのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:279
 msgid "Open an editor for the selected relation"
 msgstr "選択したリレーションの編集画面を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:320
 msgid "Delete the selected relation"
 msgstr "選択したリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:358
 #: ../plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java:344
 #: ../plugins/relcontext/src/relcontext/actions/CreateRelationAction.java:40
@@ -7545,51 +7701,51 @@
 msgstr "新規リレーション作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1442
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
 msgid "Set the current selection to the list of selected relations"
 msgstr "現在の選択を選択したリレーションのリストへセットする"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select the members of all selected relations"
 msgstr "全ての選択済リレーションのメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:463
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:462
 #: ../plugins/relcontext/src/relcontext/actions/SelectMembersAction.java:16
 msgid "Select members"
 msgstr "メンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:492
 msgid "Download all members of the selected relations"
 msgstr "選択済リレーションの全メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:493
 msgid "Download members"
 msgstr "メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:525
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:860
 msgid "Download incomplete members of selected relations"
 msgstr "選択されたリレーションの不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:862
 msgid "Download incomplete members"
 msgstr "不完全なメンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:760
 #, java-format
 msgid "Relations: {0}"
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:168
 msgid "Current Selection"
 msgstr "現在の選択範囲"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 msgid "Open a selection list window."
 msgstr "セレクションリスト　ウインドウを開きます。"
@@ -7618,5 +7774,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1164
 #: ../plugins/relcontext/src/relcontext/actions/SelectInRelationPanelAction.java:17
 msgid "Select in relation list"
@@ -7624,18 +7780,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1165
 #: ../plugins/relcontext/src/relcontext/actions/SelectInRelationPanelAction.java:18
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:503
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:374
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:64
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:50
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:53
 msgid "Selection"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:514
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
@@ -7689,5 +7845,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:182
 msgid "Select objects submitted by this user"
-msgstr ""
+msgstr "このユーザが登録したオブジェクトを選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
@@ -7724,4 +7880,6 @@
 "agreed to the new contributor terms will show a green check mark."
 msgstr ""
+"再ライセンス承認情報をサーバから読み込みます。新しい投稿規約に賛成している"
+"ユーザには緑のチェックマークが表示されます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:323
@@ -7744,5 +7902,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:92
 msgid "Validation results"
-msgstr ""
+msgstr "検証結果"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:91
@@ -7751,4 +7909,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:97
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:84
 msgid "Zoom to problem"
 msgstr "問題へズーム"
@@ -7765,5 +7924,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:124
 msgid "Ignore the selected issue next time."
-msgstr ""
+msgstr "選択された問題は次回無視します"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java:228
@@ -7983,5 +8142,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected objects"
-msgstr ""
+msgstr "選択されたオブジェクトの履歴をダウンロードして表示"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
@@ -8019,5 +8178,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding objects in the current data layer"
-msgstr ""
+msgstr "現在のデータレイヤ中の対応するオブジェクトにズームする"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
@@ -9144,6 +9303,6 @@
 "the current<br>edit layer ''{1}''.</html>"
 msgstr ""
-"<html>変更セット{0}に含まれるオブジェクトは、現在の編集中のレイヤー"
-"\"{1}\"<br>にありません。"
+"<html>変更セット{0}に含まれるオブジェクトは、現在の編集中のレイヤー\"{1}"
+"\"<br>にありません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417
@@ -9151,5 +9310,5 @@
 "Zoom to the objects in the content of this changeset in the current data "
 "layer"
-msgstr ""
+msgstr "現在のデータレイヤ中のこの変更セットに含まれるオブジェクトにズームする"
 
 #. parent for dialog is Main.parent
@@ -9193,5 +9352,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
-#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:76
 msgid "Please enter an integer value > 0"
 msgstr "1以上の整数を入力してください。"
@@ -9416,4 +9575,6 @@
 "user name in the preferences first.</em></html>"
 msgstr ""
+"<html>自分のオープン中の変更セットのダウンロードは<br><em>無効になっていま"
+"す。 まずOSMユーザ名を設定してください。</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -9426,4 +9587,6 @@
 "currently no map view active.</em></html>"
 msgstr ""
+"<html>現在のマップビュー内の変更セットのダウンロードは<br><em>無効になってい"
+"ます。 アクティブなマップビューがありません。</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
@@ -9543,8 +9706,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:645
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:153
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:166
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:293
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:300
 #: ../plugins/relcontext/src/relcontext/RelContextDialog.java:327
 #: ../plugins/relcontext/src/relcontext/RelContextDialog.java:629
@@ -9559,4 +9724,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:320
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -9592,5 +9758,5 @@
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
 #: ../plugins/relcontext/src/relcontext/RelContextDialog.java:82
 msgid "Member Of"
@@ -9599,62 +9765,62 @@
 #. <space />
 #. item "Facilities/Fire Hydrant" combo "Position"
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:589
 #: build/trans_presets.java:2578
 msgid "Position"
 msgstr "位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:904
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:907
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:954
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:960
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:955
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:961
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:957
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:963
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:984
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:980
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:986
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1017
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1060
 msgid "Go to OSM wiki for tag help (F1)"
 msgstr "タグのヘルプについて、OSM wiki を表示します(F1)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1061
 #: ../plugins/relcontext/src/relcontext/actions/RelationHelpAction.java:25
 msgid "Launch browser with wiki help for selected object"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1154
+msgstr "選択されたオブジェクトのためのwikiヘルプのためにブラウザを起動"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1160
 #: ../plugins/relcontext/src/relcontext/actions/SelectRelationAction.java:16
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1161
 #: ../plugins/relcontext/src/relcontext/actions/SelectRelationAction.java:17
 msgid "Select relation in main selection."
@@ -10292,5 +10458,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395
 msgid "Click to download the currently selected area"
-msgstr ""
+msgstr "クリックして、現在選択されている領域をダウンロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402
@@ -10777,5 +10943,5 @@
 #: ../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:375
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:364
 msgid "Conflicts detected"
 msgstr "競合が検出されました"
@@ -11043,7 +11209,17 @@
 msgstr "警告: 現在のJOSMユーザのユーザ情報参照に失敗。例外コード: {0}"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:57
+#, fuzzy
+msgid "Download objects"
+msgstr "オブジェクトをダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java:106
+#, fuzzy
+msgid "Initializing nodes to download ..."
+msgstr "更新するノードを初期化中 ..."
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:698
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:699
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1360
 msgid "Launch a file chooser to select a file"
 msgstr "ファイルを選ぶためにファイル選択を起動してください"
@@ -11456,10 +11632,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing objects to upload ..."
-msgstr ""
+msgstr "アップロードのためにオブジェクトを準備中..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
 msgstr ""
-"オブジェクトは<strong>新しい変更セット</strong>にアップロードされました。"
+"オブジェクトは<strong>新しい変更セット</strong>にアップロードされます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -11470,5 +11646,5 @@
 msgstr ""
 "オブジェクトはアップロードコメント''{1}'' 付きで<strong>オープン済み変更セッ"
-"ト</strong> {0} にアップロードされました。"
+"ト</strong> {0} にアップロードされます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
@@ -11787,5 +11963,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:643
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:151
 #: ../plugins/gpxfilter/src/gpxfilter/EGpxLayer.java:282
@@ -11886,5 +12062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:557
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:547
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
@@ -12104,25 +12280,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java:243
 msgid "ERROR"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120
+msgstr "ERROR"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
 #, java-format
 msgid "Data Layer {0}"
 msgstr "データレイヤー {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:270
 #, java-format
 msgid "version {0}"
 msgstr "バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:319
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:355
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
 #, java-format
 msgid "There was {0} conflict detected."
@@ -12130,11 +12306,11 @@
 msgstr[0] "検出された競合が {0} 個あります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
 msgid "Click to close this dialog and continue editing"
 msgstr "クリックしてこのダイアログを閉じ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:434
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
 #, java-format
 msgid "{0} deleted"
@@ -12142,32 +12318,32 @@
 msgstr[0] "{0} を削除しました"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:447
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:436
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は以下で構成されています:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:440
 msgid "unset"
 msgstr "設定解除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:451
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:440
 #, java-format
 msgid "API version: {0}"
 msgstr "APIバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:554
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:544
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "GPXレイヤーの変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642
 msgid "Dataset consistency test"
 msgstr "データセット一貫性テスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:648
 msgid "No problems found"
 msgstr "問題はありませんでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:661
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:651
 msgid "Following problems found:"
 msgstr "次の問題が見つかりました:"
@@ -12208,5 +12384,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:340
 msgid "Auto load tiles"
-msgstr ""
+msgstr "タイルの自動読み込み"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:349
@@ -12232,5 +12408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:413
 msgid "Snap to tile size"
-msgstr ""
+msgstr "タイルサイズに合わせる"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/TMSLayer.java:424
@@ -12287,24 +12463,24 @@
 msgstr "妥当性検証エラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:149
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:151
 msgid "(deactivated)"
 msgstr "(無効化)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:187
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:207
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:209
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:250
 #, java-format
 msgid ""
@@ -12315,17 +12491,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:258
 msgid "Yes, fetch images"
 msgstr "はい、画像を取得します"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:264
 msgid "Invalid URL?"
 msgstr "不正なURL？"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:560
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:534
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:567
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12333,52 +12509,57 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:546
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:579
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:560
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:628
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:582
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:649
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:680
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:618
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:685
 msgid "Save WMS layer"
 msgstr "WMS レイヤーを保存"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:642
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:709
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:714
 msgid "Load WMS layer"
 msgstr "WMS レイヤーをロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:658
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:725
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:659
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:726
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:763
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:777
 msgid "Set WMS Bookmark"
 msgstr "WMSブックマークをセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:788
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/WMSLayer.java:823
+#, fuzzy
+msgid "Zoom to native resolution"
+msgstr "セレクションへズーム"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
@@ -12896,5 +13077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:191
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:55
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:72
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:77
 #, java-format
@@ -12919,6 +13100,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:59
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:63
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:76
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java:80
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java:85
 #, java-format
@@ -13635,9 +13816,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:188
 msgid "TMS URL"
-msgstr ""
+msgstr "TMS URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:202
 msgid "TMS"
-msgstr ""
+msgstr "TMS"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java:204
@@ -13894,9 +14075,9 @@
 msgstr "全てを既定値に設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:234
 msgid "Colors used by different objects in JOSM."
 msgstr "JOSMの異なるオブジェクトが使う配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:249
 msgid "Colors"
 msgstr "色"
@@ -13907,5 +14088,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:329
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:332
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:336
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:337
 msgid "All"
 msgstr "全て"
@@ -13918,5 +14099,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:64
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:130
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:173
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:168
 #: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Issue.java:21
 msgid "None"
@@ -14042,5 +14223,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
 msgid "Draw oneway arrows."
-msgstr ""
+msgstr "一方通行の向きを矢印で表示"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
@@ -14257,5 +14438,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:133
 msgid "Sharpen (requires layer re-add): "
-msgstr ""
+msgstr "鮮鋭化(レイヤの再追加が必要): "
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:137
@@ -14309,5 +14490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:240
 msgid "Common Settings"
-msgstr ""
+msgstr "共通設定"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:241
@@ -14344,6 +14525,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:445
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:754
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:756
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1022
 #: ../plugins/relcontext/src/relcontext/actions/CreateRelationAction.java:39
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
@@ -14365,5 +14546,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:492
 msgid "copy selected defaults"
-msgstr ""
+msgstr "選択したエントリをコピーします"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java:511
@@ -14515,5 +14696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:244
 msgid "JOSM Internal Style"
-msgstr ""
+msgstr "JOSM内部スタイル"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:245
@@ -14523,5 +14704,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:249
 msgid "Potlatch 2"
-msgstr ""
+msgstr "Potlatch 2"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:250
@@ -14858,5 +15039,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:51
 msgid "Change the selection"
-msgstr ""
+msgstr "選択の変更"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:52
@@ -14870,5 +15051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:54
 msgid "Confirm all Remote Control actions manually"
-msgstr ""
+msgstr "リモート制御のアクションを全て手動で確認する"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58
@@ -14878,5 +15059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:58
 msgid "Settings for the remote control feature."
-msgstr ""
+msgstr "リモート制御機能の設定"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/RemoteControlPreference.java:60
@@ -14943,57 +15124,50 @@
 msgstr "ショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:314
 msgid "Icon paths:"
 msgstr "アイコンのパス:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:635
 #, java-format
 msgid "Short Description: {0}"
 msgstr "簡単な説明: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:634
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:635
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:636
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:637
 #, java-format
 msgid "Author: {0}"
 msgstr "作者: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:639
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:640
 #, java-format
 msgid "Webpage: {0}"
 msgstr "ウェブページ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:645
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:646
 #, java-format
 msgid "Version: {0}"
 msgstr "バージョン: {0}"
 
-#. content.add(scroller);
-#. JOptionPane.showMessageDialog(Main.parent,scroller, tr("Clearsigned Signature"), JOptionPane.PLAIN_MESSAGE);
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:665
-#: ../plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustSignaturesDialog.java:116
-msgid "Ok"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:670
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:671
 msgid "Name (optional):"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:674
+msgstr "スタイル名(オプション):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:675
 msgid "URL / File:"
 msgstr "URL / ファイル名:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:688
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:689
 msgid "active"
 msgstr "有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:824
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:826
 msgid "Edit source entry:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:896
+msgstr "ソースエントリを編集:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:898
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:403
@@ -15001,17 +15175,17 @@
 msgstr "リセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:897
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:899
 msgid "Reset to default"
 msgstr "デフォルトに戻す"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1021
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1023
 msgid "Add a new icon path"
 msgstr "新しいアイコンパスを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1034
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1036
 msgid "Remove the selected icon paths"
 msgstr "選択されたアイコンパスを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1055
+#: ../core/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java:1057
 msgid "Edit the selected icon path"
 msgstr "選択されたアイコンパスを編集"
@@ -15144,5 +15318,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:316
 msgid "Tooltip"
-msgstr ""
+msgstr "ツールチップ"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:316
@@ -15391,4 +15565,8 @@
 "server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
+"<html><body><p class=\"warning-body\"><strong>警告:</strong> パスワードは平文"
+"でJOSMの設定ファイルに格納されます。 さらにOSMサーバに対する全てのリクエスト"
+"で<strong>暗号化されずに</strong>送信されます。<strong>重要なパスワードは使わ"
+"ないでください。</strong></p></body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
@@ -15654,5 +15832,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1392
-#: ../plugins/terracer/src/terracer/TerracerAction.java:213
+#: ../plugins/terracer/src/terracer/TerracerAction.java:212
 #, java-format
 msgid "Change {0} object"
@@ -15736,5 +15914,5 @@
 "す)"
 
-#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:74
 msgid ""
 "The current value is not a valid OSM ID. Please enter an integer value > 0"
@@ -16065,5 +16243,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116
 #, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
@@ -16072,6 +16250,6 @@
 "別が不明です。"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:327
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82
@@ -16081,40 +16259,40 @@
 msgstr "OSMデータをダウンロード中..."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:355
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr "id {0} のノードを ''{1}'' から取得中"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:356
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr "id {0} のウェイを ''{1}'' から取得中"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:357
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
 msgstr "id {0} のリレーションを ''{1}'' から取得中"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 msgstr "ID {0} に対してサーバが404コードを返しました。スキップします。"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr "''{0}'' からノードのパッケージを取得中"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:406
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr "''{0}'' からウェイのパッケージを取得中"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:407
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
 msgstr "''{0}'' からリレーションのパッケージを取得中"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:418
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -16122,5 +16300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:444
 #, java-format
 msgid "Downloading {0} object from ''{1}''"
@@ -16925,5 +17103,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:103
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:106
 #, java-format
 msgid ""
@@ -16934,5 +17112,5 @@
 "ん。"
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:104
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:107
 msgid ""
 "Warning: Fetching WMS tiles is likely to fail. Please check you preference "
@@ -16940,10 +17118,10 @@
 msgstr "警告: WMSタイルの取得に失敗したようです。設定をチェックしてください。"
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:105
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:108
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
 msgstr "警告: 完全なURL は ''{0}' です。"
 
-#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:127
+#: ../core/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java:130
 #, java-format
 msgid ""
@@ -16960,5 +17138,5 @@
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:45
 msgid "Add tags"
-msgstr ""
+msgstr "タグの追加"
 
 #: ../core/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java:52
@@ -17013,26 +17191,26 @@
 "ウェブサイトが実行中のJOSMを検知できるようにします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:103
 msgid "Skip download"
 msgstr "ダウンロードをスキップ"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
 msgid "Download Plugin"
 msgstr "プラグインをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:106
 msgid "Skip Download"
 msgstr "ダウンロードをスキップ"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:107
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:108
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "プラグイン {1} には JOSMのバージョン {0} が必要です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:113
 msgid "Download skipped"
 msgstr "ダウンロードはスキップされました"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:119
 #, java-format
 msgid ""
@@ -17043,5 +17221,5 @@
 "す。ダウンロードをスキップします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:140
 #, java-format
 msgid ""
@@ -17049,13 +17227,13 @@
 "valid URL. Skipping download."
 msgstr ""
-"警告: プラグイン\"{0}\"をダウンロードできません。ダウンロードリンク"
-"\"{1}\"は、不正なURLです。ダウンロードスキップします。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
+"警告: プラグイン\"{0}\"をダウンロードできません。ダウンロードリンク\"{1}"
+"\"は、不正なURLです。ダウンロードスキップします。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:160
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
 msgstr "プラグインディレクトリ\"{0}\"の作成に失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:175
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:168
 #, java-format
 msgid "Downloading Plugin {0}..."
@@ -17379,24 +17557,24 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:99
 msgid "Illegal entry in plugin list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46
+msgstr "プラグインリスト中に不正なエントリ。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:42
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:47
 msgid "Reading local plugin information.."
 msgstr "ローカルプラグイン情報を読み込みます.."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:90
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:91
 msgid "Processing plugin site cache files..."
 msgstr "プラグインのサイトキャッシュファイルを処理中..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:94
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:143
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:95
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:144
 #, java-format
 msgid "Processing file ''{0}''"
 msgstr "ファイル \"{0}\"の処理中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:98
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:153
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:99
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:154
 #, java-format
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
@@ -17405,24 +17583,24 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:115
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:116
 msgid "Processing plugin site cache icon files..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:140
 msgid "Processing plugin files..."
 msgstr "プラグインファイルの処理中..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:66
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:77
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:67
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:78
 msgid "Download plugin list..."
 msgstr "プラグインリストをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:159
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:212
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:160
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:209
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
 msgstr "''{0}'' からプラグインリストをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:270
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:263
 #, java-format
 msgid ""
@@ -17433,16 +17611,16 @@
 "からのプラグインリストをキャッシュできません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:274
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:267
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
 msgstr "ローカルキャッシュ ''{0}'' にプラグインリストを書き込み中"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:318
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:311
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
 msgstr "サイト ''{0}'' からのプラグインリストをパースしています"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:323
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:326
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:316
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
 #, java-format
 msgid ""
@@ -17453,5 +17631,5 @@
 "す。例外コード: {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:355
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:348
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
@@ -17605,4 +17783,6 @@
 "following error:<br>''{0}''</html>"
 msgstr ""
+"<html>OSMサーバでの認証に失敗しました。<br>サーバは以下のエラーを通知しまし"
+"た:<br>''{0}''</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:164
@@ -17927,5 +18107,5 @@
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java:43
 msgid "Columbus V-900 CSV Files"
-msgstr ""
+msgstr "Columbus V-900 CSVファイル"
 
 #. *
@@ -17954,5 +18134,5 @@
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:171
 msgid "Error in line "
-msgstr ""
+msgstr "右記の行中でエラー "
 
 #: ../plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java:390
@@ -18212,49 +18392,49 @@
 #. Show name of profile in title
 #. no elevation data, -> switch back to empty view
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:97
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:288
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:313
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:92
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:299
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:324
 msgid "Elevation Profile"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:98
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:93
 msgid "Open the elevation profile window."
 msgstr ""
 
 #. first row: Headlines with bold font
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:135
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:130
 msgid "Min"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:138
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:133
 msgid "Avrg"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:141
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:136
 msgid "Max"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:144
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:139
 msgid "Dist"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:147
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:142
 msgid "Gain"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:150
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:145
 msgid "Time"
 msgstr ""
 
 #. Geoid
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:169
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:164
 msgid "Geoid"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:185
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:180
 msgid "Automatic"
 msgstr ""
 
-#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:195
+#: ../plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java:190
 msgid "Fixed value"
 msgstr ""
@@ -18380,5 +18560,5 @@
 #: ../plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditModel.java:55
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:168
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:138
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:137
 msgid "Segments"
 msgstr "セグメント"
@@ -18534,45 +18714,87 @@
 msgstr "イメージレイヤを作成中にエラー: "
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:100
+msgid "ImproveWayAccuracy"
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:101
+msgid "Improve Way Accuracy mode"
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:103
+msgid "Improve Way Accuracy"
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:187
+msgid "Click on the way to start improving its shape."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:189
+msgid "Select a way that you want to make more accurate."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:192
+msgid "Click to move the highlighted node. Hold Ctrl to add new nodes."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:194
+msgid "Click to add a new node. Release Ctrl to move existing nodes."
+msgstr ""
+
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:352
+#, fuzzy
+msgid "Cannot place a node outside of the world."
+msgstr "世界の外にノードを追加できません。"
+
+#. Finishing the sequence command
+#: ../plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWAMode.java:409
+#, fuzzy, java-format
+msgid "Add and a new node to way"
+msgid_plural "Add and a new node to {0} ways"
+msgstr[0] "既存のウェイに新しいノードを追加"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:80
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:82
 msgid "Edit opening hours"
 msgstr "開店時間を編集"
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:81
 msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
-msgid "Change properties of 1 object"
-msgstr "1つのオブジェクトのプロパティを変更"
-
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
-#, java-format
-msgid "You have {0} Elements selected. But you can edit only one element!"
-msgstr ""
-
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:188
+#, fuzzy
+msgid "edit existing tag"
+msgstr "欠落したタグを追加"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:195
+#, fuzzy
+msgid "edit new tag"
+msgstr "新しいタグを追加"
+
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:251
 msgid "Choose key"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:83
 #, java-format
 msgid "apply {0}"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
+#. TODO focus on the valueField
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:153
 msgid "There is something wrong in the value near:"
 msgstr "右記の値の近傍にある何かが不正です:"
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:156
 #, java-format
 msgid "Info: {0}"
 msgstr ""
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:157
 msgid "Correct the value manually and than press Enter."
 msgstr "値を手動で修正してその後にEnterを押してください。"
 
-#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:138
+#: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:159
 msgid "Error in timeformat"
 msgstr "時間の形式にエラー"
@@ -18955,17 +19177,21 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+msgid "Use address nodes under buildings"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:22
 msgid "Advanced settings"
 msgstr "高度な設定"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Buildings tags:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:233
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:278
 msgid "Cannot place building outside of the world."
 msgstr "世界の外側には建物を配置できません。"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:256
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:320
 msgid "Create building"
 msgstr "建物を作成"
@@ -19866,4 +20092,70 @@
 msgstr "配色"
 
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:21
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:22
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationPlugin.java:41
+#, fuzzy
+msgid "Conflation"
+msgstr "確認"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:21
+#, fuzzy
+msgid "Conflation tool for merging data"
+msgstr "クリックしてノードのマージを中断"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:37
+msgid ""
+"There are no data layers present. Please open or create at least one data "
+"layer and try again."
+msgstr ""
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java:39
+#, fuzzy
+msgid "Cannot perform conflation"
+msgstr "リレーション用エディタを呼び出す"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationLayer.java:43
+#, fuzzy
+msgid "Conflation symbols"
+msgstr "確認"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:28
+#, fuzzy
+msgid "Conflation Options"
+msgstr "競合中のリレーション"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsDialog.java:55
+#, fuzzy
+msgid "Close the dialog, do not perform conflation"
+msgstr "ダイアログを閉じて、新しいノードを作成しない"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:600
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:632
+#, fuzzy
+msgid "No valid OSM data layer present."
+msgstr "GPXデータのレイヤーがありません"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:601
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:633
+#, fuzzy
+msgid "Error freezing selection"
+msgstr "セレクションの削除"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:606
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:638
+#, fuzzy
+msgid "Nothing is selected, please try again."
+msgstr "ズームする対象が選択されていません。"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:607
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:639
+#, fuzzy
+msgid "Empty selection"
+msgstr "選択を更新"
+
+#: ../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationOptionsPanel.java:670
+msgid "Unresolved differences remain, please fix remaining differences."
+msgstr ""
+
 #: ../plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java:40
 msgid "Contour Merge"
@@ -20062,5 +20354,4 @@
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:32
 #: ../plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java:223
 msgid "Name:"
@@ -20779,4 +21070,89 @@
 msgid "Could not acquire image"
 msgstr "イメージを取得できませんでした"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:20
+msgid "Basic License Check."
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:21
+msgid "Checks if all contributors have agreed to the new CT/License."
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:51
+#, fuzzy
+msgid "Creator has rejected CT"
+msgstr "リレーションが選択されていません"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:51
+#, fuzzy
+msgid "Creator unknown"
+msgstr "不明な"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:56
+msgid "Creator has not (yet) accepted CT"
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/BasicLicenseCheck.java:66
+msgid "Object modified by user(s) who have rejected, or not agreed to, CT"
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:39
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:40
+#, fuzzy
+msgid "License Check"
+msgstr "ライセンス"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:39
+#, fuzzy
+msgid "Performs the license check"
+msgstr "プロパティチェッカー："
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:101
+msgid "Loading from Quick History Service"
+msgstr ""
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java:145
+#, fuzzy
+msgid "Analyzing"
+msgstr "初期化"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:77
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:78
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:103
+#, fuzzy
+msgid "Relicensing problems"
+msgstr "色つけに問題発生"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java:77
+#, fuzzy
+msgid "Open the relicensing window."
+msgstr "妥当性検証ウィンドウを開く"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:40
+#, fuzzy
+msgid "Relicensing Problems"
+msgstr "色つけに問題発生"
+
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/ProblemLayer.java:101
+#, fuzzy
+msgid "No relicensing problems"
+msgstr "色つけに問題発生"
+
+#. * Error messages
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:15
+#, fuzzy
+msgid "Data loss"
+msgstr "データソース"
+
+#. * Warning messages
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:19
+msgid "Possible data loss"
+msgstr ""
+
+#. * Other messages
+#: ../plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/Severity.java:23
+#, fuzzy
+msgid "Data reduction"
+msgstr "方向"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:131
@@ -22163,239 +22539,4 @@
 msgstr "新しい値は{0}"
 
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:18
-msgid "Run..."
-msgstr ""
-
-#. title
-#. icon name
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptAction.java:20
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:153
-msgid "Run a script"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:80
-msgid "Select a script file and click on <strong>Run</strong>."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:108
-msgid "File:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:112
-msgid "Enter the name of a script file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:208
-msgid "Run"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:209
-msgid "Run the script"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:216
-#, java-format
-msgid "The script file ''{0}'' doesn''t exist."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:217
-msgid "File not found"
-msgstr "ファイルが見つかりません"
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:226
-msgid "Please enter a file name first."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:227
-msgid "Empty file name"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:236
-#, java-format
-msgid "The script file ''{0}'' isn''t readable."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:237
-msgid "File not readable"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:246
-#, java-format
-msgid "Failed to read the script from the file ''{0}''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:247
-msgid "IO error"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:251
-#, java-format
-msgid "Failed to read a macro from the file ''{0}''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:258
-msgid "Script execution has failed."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:259
-msgid "Script Error"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:263
-msgid "Macro execution has failed."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:272
-msgid ""
-"<p>The script can''t be executed, because there are currently no scripting "
-"engines installed.</p><p>Refer to the online help for information about how "
-"to install a scripting engine with JOSM.</p>"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:277
-msgid "No script engine"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:346
-msgid "..."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:347
-msgid "Launch file selection dialog"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/RunScriptDialog.java:358
-msgid "Select a script"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:56
-msgid "Warning: failed to load mime types from file ''0''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineProvider.java:65
-msgid "Warning: failed to load default mime types from  resource ''0''."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:94
-msgid "Please select a scripting engine to execute the selected script."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:171
-msgid "Accept the selected scripting engine"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptEngineSelectionDialog.java:195
-msgid "cancel"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ScriptingPlugin.java:34
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:35
-msgid "Scripting"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:21
-msgid "Configure..."
-msgstr ""
-
-#. title
-#. icon name
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ConfigureAction.java:23
-msgid "Configure scripting preferences"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:28
-msgid "Script engines"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/PreferenceEditor.java:34
-msgid "Configure script engines and scripts"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:32
-#, java-format
-msgid "''{0}'' doesn''t exist."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:37
-#, java-format
-msgid "''{0}'' is a directory. Expecting a jar file instead."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:41
-#, java-format
-msgid "''{0}'' isn't readable. Can''t load a script engine from this file."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:48
-#, java-format
-msgid ""
-"Failed to open file ''{0}'' as jar file. Can''t load a script engine from "
-"this file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEngineJarInfo.java:53
-#, java-format
-msgid ""
-"The jar file ''{0}'' doesn''t provide a script engine. The entry ''{1}'' is "
-"missing."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:80
-msgid "JAR files"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:89
-msgid "Enter additional JAR files which provide script engines."
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:135
-msgid "Available script engines"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:143
-msgid "JOSM currently supports the following script engines:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:203
-msgid "JAR file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:285
-msgid "Remove the selected jar files"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:309
-msgid "Add a jar file providing a script engine"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:393
-msgid "Launch file chooser"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/preferences/ScriptEnginesConfigurationPanel.java:404
-msgid "Select a jar file"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:26
-#, java-format
-msgid "{1} (with engine {0})"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:33
-msgid "Version:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:34
-msgid "Language:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:35
-msgid "Language version:"
-msgstr ""
-
-#: ../plugins/scripting/src/org/openstreetmap/josm/plugins/scripting/ui/ScriptEngineCellRenderer.java:36
-msgid "MIME-Types:"
-msgstr ""
-
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:48
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:49
@@ -22633,30 +22774,30 @@
 msgstr "偶数/奇数"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:131
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:130
 msgid "Lowest number"
 msgstr "最も小さな番号"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:135
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:134
 msgid "Highest number"
 msgstr "最も大きな番号"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:179
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:178
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:207
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:206
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:233
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:232
 msgid "Segment must be a number greater 1"
 msgstr "セグメントは1より大きい数値でなければなりません"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:257
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:256
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr "{0} は0より大きくなければなりません"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:262
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:261
 #, java-format
 msgid "{0} is not a number"
@@ -22683,18 +22824,18 @@
 msgstr "テラスを反転"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:71
-#: ../plugins/terracer/src/terracer/TerracerAction.java:74
+#: ../plugins/terracer/src/terracer/TerracerAction.java:69
+#: ../plugins/terracer/src/terracer/TerracerAction.java:72
 msgid "Terrace a building"
 msgstr "建物のテラス"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:72
+#: ../plugins/terracer/src/terracer/TerracerAction.java:70
 msgid "Creates individual buildings from a long building."
 msgstr "長い建物から個別の建物を生成"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:167
+#: ../plugins/terracer/src/terracer/TerracerAction.java:166
 msgid "Invalid selection"
 msgstr "不正な選択"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:169
+#: ../plugins/terracer/src/terracer/TerracerAction.java:168
 msgid ""
 "Select a single, closed way of at least four nodes. (Optionally you can also "
@@ -22703,6 +22844,6 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:210
-#: ../plugins/terracer/src/terracer/TerracerAction.java:431
+#: ../plugins/terracer/src/terracer/TerracerAction.java:209
+#: ../plugins/terracer/src/terracer/TerracerAction.java:450
 msgid "Terrace"
 msgstr "テラスハウス"
@@ -23095,24 +23236,24 @@
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:135
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:129
 #, java-format
 msgid "{0} lanes are not referenced in any turn-relation."
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:279
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:277
 msgid "Put the ways in order."
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:372
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:365
 #, java-format
 msgid "Relation references non-existent (regular) lane {0}"
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:378
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:371
 #, java-format
 msgid "Relation references non-existent extra lane {0}"
 msgstr ""
 
-#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:399
+#: ../plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Validator.java:396
 #, java-format
 msgid "Integer list \"{0}\" contains unexpected values."
@@ -23913,15 +24054,15 @@
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:26
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:27
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:49
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:30
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:31
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:53
 msgid "Add nodes at intersections"
 msgstr "交差点にノードを追加"
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:26
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:30
 msgid "Add missing nodes at intersections of selected ways."
 msgstr ""
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:39
+#: ../plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java:43
 msgid "Please select one or more ways with intersections of segments."
 msgstr ""
@@ -23969,7 +24110,12 @@
 msgstr "分離されたリレーション"
 
-#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:38
+#: ../plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java:41
 msgid "More tools"
 msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:20
+#, fuzzy
+msgid "Align Way Nodes"
+msgstr "ウェイをアライン"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:24
@@ -23981,8 +24127,23 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java:67
+#, java-format
+msgid "Internal error: number of nodes is {0}."
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java:19
+#, fuzzy
+msgid "Paste Relations"
+msgstr "親リレーション"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java:22
 msgid ""
 "Paste relation membership from objects in the buffer onto selected object(s)"
 msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:25
+#, fuzzy
+msgid "Replace Geometry"
+msgstr "置換"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java:29
@@ -24007,8 +24168,18 @@
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:19
+#, fuzzy
+msgid "Copy tags from previous selection"
+msgstr "リレーションからのタグ"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java:25
 msgid "Pastes tags of previously selected object(s)"
 msgstr ""
 
+#: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java:19
+#, fuzzy
+msgid "Add Source Tag"
+msgstr "情報ソース"
+
 #: ../plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java:25
 msgid "Add remembered source tag"
@@ -24068,4 +24239,16 @@
 msgid "Too many ways are added: {0}!"
 msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:27
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java:28
+#, fuzzy
+msgid "Select last modified nodes"
+msgstr "ノード {0} 用に'変更された'フラグをセット"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:27
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java:28
+#, fuzzy
+msgid "Select last modified ways"
+msgstr "複製したウェイを削除"
 
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:32
@@ -24076,4 +24259,13 @@
 #: ../plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java:32
 msgid "Select all nodes of a selected way."
+msgstr ""
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:26
+#, fuzzy
+msgid "Undo selection"
+msgstr "選択に追加"
+
+#: ../plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java:27
+msgid "Reselect last added object or selection form history"
 msgstr ""
 
@@ -24164,5 +24356,5 @@
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:143
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:191
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:193
 msgid "loop"
 msgstr "ループ"
@@ -24208,47 +24400,47 @@
 msgstr "ループポイント近辺の長さをセット"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:180
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:181
 msgid "no deinterlacing"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:185
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:186
 msgid "deinterlacing using line doubling"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:190
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:191
 msgid "deinterlacing using linear interpolation"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:291
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:282
 msgid "Jump to"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:311
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java:302
 msgid "Jump to GPS time"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java:306
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java:307
 msgid "Shows current position in the video"
 msgstr "ビデオ中の現在位置を表示"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java:49
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java:53
 msgid "Sync"
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:54
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:79
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:56
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:82
 msgid "Unable to find JNA Java library!"
 msgstr "JNA Java libraryが見つかりません！"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:58
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:83
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:60
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java:86
 msgid "Unable to find native libvlc library!"
 msgstr "ネイティブlibvlc libraryが見つかりません！"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:188
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:190
 msgid "play"
 msgstr "再生"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:192
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java:194
 msgid "mute"
 msgstr "ミュート"
@@ -24839,7 +25031,7 @@
 msgstr ""
 
-#. Plugin contourmerge
+#. Plugin conflation
 #: build/trans_plugins.java:16
-msgid "Merges the contours of two areas"
+msgid "Tool for conflation (merging) data"
 msgstr ""
 
@@ -24948,11 +25140,19 @@
 msgstr ""
 
+#. Plugin ImproveWayAccuracy
+#: build/trans_plugins.java:56
+msgid ""
+"Can be useful when you are improving accuracy of existing ways. The idea of "
+"the plugin is to substitute dragging and dropping nodes with clicking to "
+"quicken the editing process."
+msgstr ""
+
 #. Plugin irsrectify
-#: build/trans_plugins.java:56
+#: build/trans_plugins.java:58
 msgid "A helper for IRS satellite adjustment."
 msgstr ""
 
 #. Plugin junctionchecking
-#: build/trans_plugins.java:58
+#: build/trans_plugins.java:60
 msgid ""
 "creates a channel digraph and checks a subset of channels if it is a "
@@ -24961,10 +25161,17 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:60
+#: build/trans_plugins.java:62
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
+#. Plugin licensechange
+#: build/trans_plugins.java:64
+msgid ""
+"Checks if all users contributing to an object have agreed to the license "
+"change."
+msgstr ""
+
 #. Plugin livegps
-#: build/trans_plugins.java:62
+#: build/trans_plugins.java:66
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -24973,5 +25180,5 @@
 #. File ../plugins/mapdust/build.xml had no data
 #. Plugin measurement
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:69
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -24983,20 +25190,20 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:71
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "4 または5のウェイのセットに左折禁止を追加"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:73
 msgid "Simply convert an area to a multipolygon."
 msgstr "単純にエリアをマルチポリゴンに変換します。"
 
 #. Plugin namemanager
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:75
 msgid "Allows to attribute tags to all objects in any selected area at once"
 msgstr ""
 
 #. Plugin nearclick
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:77
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -25009,10 +25216,10 @@
 
 #. Plugin OpeningHoursEditor
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:79
 msgid "extended options for editing opening_hours"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:81
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -25021,5 +25228,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:83
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -25027,5 +25234,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:85
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -25035,10 +25242,10 @@
 
 #. Plugin pdfimport
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:87
 msgid "Import PDF file and convert to ways."
 msgstr ""
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:89
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -25049,5 +25256,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:91
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -25058,15 +25265,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:93
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. Plugin proj4j
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:95
 msgid "adds projections from Proj4J"
 msgstr ""
 
 #. Plugin public_transport
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:97
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -25074,25 +25281,25 @@
 
 #. Plugin reltoolbox
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:99
 msgid "Relation and multipolygon creating and editing panel."
 msgstr ""
 
 #. Plugin restart
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:101
 msgid "Adds &quot;Restart JOSM&quot; item to File menu."
 msgstr ""
 
 #. Plugin reverter
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:103
 msgid "Plugin for reverting changesets"
 msgstr "変更セットを元に戻すプラグイン"
 
 #. Plugin rgisopen
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:105
 msgid "Use rgis.spb.ru image as overlay"
 msgstr ""
 
 #. Plugin RoadSigns
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:107
 msgid ""
 "Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -25102,5 +25309,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:109
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -25112,15 +25319,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:107
+#: build/trans_plugins.java:111
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
-#. Plugin scripting
-#: build/trans_plugins.java:109
-msgid "Allows to run scripts in JOSM."
-msgstr ""
-
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:111
+#: build/trans_plugins.java:113
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -25130,20 +25332,20 @@
 #. Plugin smed
 #. Plugin smed_fw
-#: build/trans_plugins.java:113 build/trans_plugins.java:115
+#: build/trans_plugins.java:115 build/trans_plugins.java:117
 msgid "Create and edit seamaps for OpenSeaMap"
 msgstr "openSeaMap用の海図を作成・編集"
 
 #. Plugin surveyor
-#: build/trans_plugins.java:117
+#: build/trans_plugins.java:119
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:119
+#: build/trans_plugins.java:121
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:121
+#: build/trans_plugins.java:123
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -25156,15 +25358,15 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:123
+#: build/trans_plugins.java:125
 msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 #. Plugin SeaMapEditor
-#: build/trans_plugins.java:125
+#: build/trans_plugins.java:127
 msgid "Create and edit seamarks for OpenSeaMap"
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:127
+#: build/trans_plugins.java:129
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -25173,5 +25375,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:129
+#: build/trans_plugins.java:131
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -25180,10 +25382,10 @@
 
 #. Plugin trustosm
-#: build/trans_plugins.java:131
+#: build/trans_plugins.java:133
 msgid "Plugin to digital sign OSM-Data"
 msgstr ""
 
 #. Plugin turnlanes
-#: build/trans_plugins.java:133
+#: build/trans_plugins.java:135
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -25191,5 +25393,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:135
+#: build/trans_plugins.java:137
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -25198,15 +25400,15 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:137
+#: build/trans_plugins.java:139
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. Plugin utilsplugin2
-#: build/trans_plugins.java:139
+#: build/trans_plugins.java:141
 msgid "Several utilities that make your life easier."
 msgstr ""
 
 #. Plugin videomapping
-#: build/trans_plugins.java:141
+#: build/trans_plugins.java:143
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -25216,5 +25418,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:143
+#: build/trans_plugins.java:145
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -25225,20 +25427,20 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:145
+#: build/trans_plugins.java:147
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin waypoint_search
-#: build/trans_plugins.java:147
+#: build/trans_plugins.java:149
 msgid "Enables searching for waypoint imported from gpx file."
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:149
+#: build/trans_plugins.java:151
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:151
+#: build/trans_plugins.java:153
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -36760,10 +36962,4 @@
 msgstr "広葉樹"
 
-#. item "Nature/Wood" combo "Type" display value
-#. item "Nature/Forest" combo "Type" display value
-#: build/trans_presets.java:3835 build/trans_presets.java:3844
-msgid "mixed"
-msgstr "混合林"
-
 #. item "Nature/Forest"
 #: build/trans_presets.java:3837
@@ -41143,4 +41339,10 @@
 msgstr ""
 
+#~ msgid "Change properties of 1 object"
+#~ msgstr "1つのオブジェクトのプロパティを変更"
+
+#~ msgid "File not found"
+#~ msgstr "ファイルが見つかりません"
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -41683,7 +41885,4 @@
 #~ msgstr "二つだけのノード選択が許されています"
 
-#~ msgid "Only one node selected"
-#~ msgstr "ただ一つだけのノードが選択されています。"
-
 #~ msgid "Enter the coordinates for the new node."
 #~ msgstr "新しいノードの座標を入力してください"
@@ -41727,7 +41926,4 @@
 #~ msgid "Illegal tag/value combinations"
 #~ msgstr "不正なタグ/値の組み合わせです"
-
-#~ msgid "Painting problem"
-#~ msgstr "色つけに問題発生"
 
 #~ msgid "Check for paint notes."
@@ -42468,7 +42664,4 @@
 #~ msgid "There are unresolved conflicts. You have to resolve these first."
 #~ msgstr "未解決の競合があります。まずこれらの競合を解決してください。"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "競合中のリレーション"
 
 #~ msgid "Solve Conflicts"
@@ -43738,7 +43931,4 @@
 #~ "ドは使用しないでください。</b></html>"
 
-#~ msgid "Confirmation"
-#~ msgstr "確認"
-
 #~ msgid "Reached the end of the line"
 #~ msgstr "ラインの終端に到達"
@@ -44098,7 +44288,4 @@
 #~ "ン {2} の相手のプリミティブは表示されません。この不整合を解決できません。"
 #~ "自分のプリミティブを残します。 "
-
-#~ msgid "Replace"
-#~ msgstr "置換"
 
 #~ msgid ">"
@@ -45195,7 +45382,4 @@
 #~ msgstr "リレーション {0} 用に'変更された'フラグをセット"
 
-#~ msgid "Set the 'modified' flag for node {0}"
-#~ msgstr "ノード {0} 用に'変更された'フラグをセット"
-
 #~ msgid ""
 #~ "Can''t merge primitives with different ids. This id is {0}, the other is "
@@ -45613,7 +45797,7 @@
 #~ "strong> is not available yet. It is missing both in your local language "
 #~ "({1}) and in english.<br><br>Please help to improve the JOSM help system "
-#~ "and fill in the missing information. You can both edit the <a href="
-#~ "\"{2}\">help topic in your local language ({1})</a> and the <a href="
-#~ "\"{3}\">help topic in english</a>.</p></html>"
+#~ "and fill in the missing information. You can both edit the <a href=\"{2}"
+#~ "\">help topic in your local language ({1})</a> and the <a href=\"{3}"
+#~ "\">help topic in english</a>.</p></html>"
 #~ msgstr ""
 #~ "<html><p class=\"warning-header\">ヘルプ項目の解説文がありません。</p><p "
