Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 21603)
+++ applications/editors/josm/i18n/po/ja.po	(revision 21626)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-05 23:12+0200\n"
-"PO-Revision-Date: 2010-06-07 03:35+0000\n"
+"POT-Creation-Date: 2010-06-09 18:33+0200\n"
+"PO-Revision-Date: 2010-06-09 03:48+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-06-07 07:01+0000\n"
+"X-Launchpad-Export-Date: 2010-06-09 17:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -68,7 +68,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:391
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -88,5 +88,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
@@ -182,5 +182,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:171
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
 msgid "Plugins"
 msgstr "プラグイン"
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -270,6 +270,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:914
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -396,4 +397,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
@@ -401,5 +403,5 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -436,6 +438,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -657,5 +659,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:278
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -1403,5 +1405,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:61
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:95
 msgid "Preferences"
@@ -1434,6 +1436,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:300
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:343
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1460,7 +1462,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:779
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:753
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:109
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:787
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1489,5 +1493,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:72
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
@@ -1669,4 +1673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 msgid "Yes"
 msgstr "はい"
@@ -2224,5 +2229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
 msgid "Error during download"
-msgstr ""
+msgstr "ダウンロード中にエラー"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2267,38 +2272,38 @@
 msgstr "モード: フォーカスを描画"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
 msgid "Cannot add a node outside of the world."
 msgstr "世界の外にノードを追加できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "ノードでウェイに追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "既存のウェイをノードとつなぎます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "既存のウェイに新しいノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
 msgid "Create new node."
 msgstr "新規ノードの作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
 msgid "Select node under cursor."
 msgstr "カーソルの下のノードを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2306,14 +2311,14 @@
 msgstr[0] "新規ノードを {0}このウェイに追加します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Start new way from last node."
 msgstr "新規ウェイを最後に操作したノードから開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr "最後に操作したノードからウェイを継続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980
 msgid "Finish drawing."
 msgstr "描画の完了"
@@ -2518,24 +2523,32 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
+msgid "all objects"
+msgstr "全オブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
+msgid "Also include incomplete and deleted objects in search."
+msgstr "検索に不完全および削除済みオブジェクトも含める。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
 msgid "regular expression"
 msgstr "正規表現検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>ベイカー ストリート</b> - 任意のキーや名前に ''ベイカー'' と ''ストリート'' を両方含むもの"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:176
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に ''ベイカー ストリート'' を含むもの。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - nameタグに ''Bak'' を含むもの"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> -  キー ''type'' の値が ''route'' であるもの"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2545,38 +2558,38 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - name に\"Bak'' を含まない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>oneway?</b> - oneway=yes もしくは true, 1, on のオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=任意の値を入力してください."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<u>Special targets:</u>"
 msgstr "<u>特殊なターゲット:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - 該当ユーザに変更された全オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr "<b>user:anonymous</b> - 匿名ユーザによって変更された全てのオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - オブジェクトに与えられた ID (0 は新しいオブジェクト)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2584,5 +2597,5 @@
 msgstr "<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョン番号のないオブジェクトは0）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2590,5 +2603,5 @@
 msgstr "<b>changeset:</b>... - 変更セットIDのオブジェクト（変更セットに含まれていないオブジェクトは0)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or "
@@ -2596,5 +2609,5 @@
 msgstr "<b>nodes:</b>... - 指定した数のノードをもつオブジェクト（nodes:数 または nodes:最小-最大で指定）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2602,9 +2615,9 @@
 msgstr "<b>tags:</b>... - 与えられた数値のタグのオブジェクト (tags:件数 または tags:最小値-最大値)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid "<b>role:</b>... - object with given role in a relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2614,39 +2627,39 @@
 "12T14:51:09Z</b>、<b>2009-11-12</b>　や <b>T14:51</b> 等)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - 変更されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b>- すべての不完全なオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - タグの無いオブジェクト全て"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr "文字列に引用符をつける場合は<b>\"</b> を使ってください（キーが<b>:</b>を含む場合など）"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2656,9 +2669,9 @@
 "\"</b> 及び <b>\\\\</b>）。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2668,38 +2681,38 @@
 msgstr "フィルター"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 msgid "Submit filter"
 msgstr "フィルターを登録"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 msgid "Start Search"
 msgstr "検索開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:379
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "\"{0}\"にマッチするものが見つからない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:381
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:383
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}'' を検索しましたが、選択からは何も取り除いていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "選択の中に \"{0}\" と一致するものは見つかりませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:395
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404
 #, java-format
 msgid "Found {0} matches"
@@ -2707,5 +2720,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:423
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437
 msgctxt "search"
 msgid "CS"
@@ -2713,5 +2726,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438
 msgctxt "search"
 msgid "CI"
@@ -2719,8 +2732,14 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440
 msgctxt "search"
 msgid "RX"
 msgstr "RX"
+
+#. all elements
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442
+msgctxt "search"
+msgid "A"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
@@ -2850,5 +2869,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
@@ -3047,5 +3066,5 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:451
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
@@ -3057,9 +3076,19 @@
 "き起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:459
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240
 msgid "Delete confirmation"
 msgstr "削除確認"
 
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+msgid ""
+"You are about to delete incomplete objects.<br>This will cause problems "
+"because you don't see the real object.<br>Do you really want to delete?"
+msgstr ""
+"不完全なオブジェクトを削除しようとしています。<br>実際のオブジェクトを見ていないので問題を引き起こす可能性があります。<br>本当に削除しますか？"
+
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
 #, java-format
@@ -3177,5 +3206,5 @@
 msgstr "適用しますか?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:199
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3442,5 +3471,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:656
 #, java-format
 msgid ""
@@ -3604,5 +3633,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:110
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3613,5 +3642,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3624,5 +3653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:383
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3655,85 +3684,4 @@
 msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
 msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:180
-msgid "Area style way is not closed."
-msgstr "領域を指定するウェイが閉じていません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:259
-msgid "More than one \"from\" way found."
-msgstr "二つ以上の\"from\"ウェイがあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:265
-msgid "More than one \"to\" way found."
-msgstr "二つ以上の\"to\"ウェイがあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:271
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:285
-msgid "More than one \"via\" found."
-msgstr "経由地が複数有ります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:276
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:290
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "不明なロール\"{0}\"です。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr "{0}のメンバーのタイプが不明"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:299
-msgid "No \"from\" way found."
-msgstr "\"from\"ウェイが見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:303
-msgid "No \"to\" way found."
-msgstr "\"to\"ウェイが見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
-msgid "No \"via\" node or way found."
-msgstr "経由地かウェイが見つかりません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:316
-msgid "The \"from\" way does not start or end at a \"via\" node."
-msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:320
-msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:351
-msgid "The \"from\" way does not start or end at the \"via\" way."
-msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
-msgid "The \"to\" way does not start or end at the \"via\" way."
-msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:449
-#, java-format
-msgid "Style for restriction {0} not found."
-msgstr "制約条件{0}のスタイルがありません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:522
-#, java-format
-msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:550
-#, java-format
-msgid "Style for outer way ''{0}'' mismatches."
-msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
-#, java-format
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:747
-#, java-format
-msgid "Warning: {0}"
-msgstr "Warning: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
@@ -4338,9 +4286,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Edit"
 msgstr "編集"
@@ -4883,6 +4831,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:464
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:654
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:154
@@ -5672,5 +5620,5 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:83
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5735,5 +5683,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
@@ -5814,5 +5762,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "有効化"
@@ -5931,5 +5879,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:419
 msgid "Call editor for relation"
-msgstr ""
+msgstr "リレーション用エディタを呼び出す"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:420
@@ -8988,5 +8936,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
 msgid "Launch a file chooser to select a file"
 msgstr "ファイルを選ぶためにファイル選択を起動してください"
@@ -8998,4 +8946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 msgid "No"
 msgstr "いいえ"
@@ -9760,5 +9709,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:416
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
 msgid "Description: {0}"
@@ -10517,9 +10466,9 @@
 msgstr "URL を表示する際にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:129
 msgid "Illegal dash pattern, values must be positive"
 msgstr "不正なマイナス符号、値は正でないといけません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:135
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr "不正なマイナス符号。少なくとも1つは正の値にしてください。"
@@ -11176,5 +11125,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid "Please select the row to edit."
 msgstr "編集する列を選択してください。"
@@ -11188,5 +11137,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:734
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11497,5 +11446,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Create markers when reading GPX."
-msgstr ""
+msgstr "GPX読み込み時にマーカーを作成。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
@@ -11669,5 +11618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:135
 msgid "Enable built-in defaults"
 msgstr "ビルトインのデフォルトを有効"
@@ -11917,18 +11866,18 @@
 msgstr "修飾グループ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:93
 msgid "Close the preferences dialog and discard preference updates"
 msgstr "プリファレンスダイアログを閉じてプリファレンスの更新を破棄"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:111
 msgid "Save the preferences and close the dialog"
 msgstr "プリファレンスを保存してダイアログを閉じる"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
 msgid "Display Settings"
 msgstr "表示設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -11936,37 +11885,37 @@
 msgstr "プログラム全体の見た目に影響する各種設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
 msgid "Connection Settings for the OSM server."
 msgstr "OSMサーバへの接続設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
 msgid "Map Settings"
 msgstr "マップ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
 msgid "Settings for the map projection and data interpretation."
 msgstr "地図投影法とデータ解釈の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
 msgid "Audio Settings"
 msgstr "オーディオ設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
 msgid "Settings for the audio player and audio markers."
 msgstr "オーディオプレイヤーと音声マークの設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
 msgid "Configure available plugins."
 msgstr "利用可能なプラグインを設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143
 msgid "Download plugins"
 msgstr "プラグインをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
@@ -12052,74 +12001,74 @@
 msgstr "アイコンのパス"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:408
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:425
 #, java-format
 msgid "Short Description: {0}"
 msgstr "簡単な説明: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:408
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:425
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:427
 #, java-format
 msgid "Author: {0}"
 msgstr "作者: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:413
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:430
 #, java-format
 msgid "Webpage: {0}"
 msgstr "ウェブページ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:419
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:436
 #, java-format
 msgid "Version: {0}"
 msgstr "バージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:641
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
 msgid "New"
 msgstr "新規"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
 msgid "Add a filename or an URL of an active style"
 msgstr "ファイル名または有効なスタイルのURLを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:448
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:465
 msgid "Remove the selected styles from the list of active styles"
 msgstr "有効なスタイルのリストから選択したスタイルを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:469
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:486
 msgid "Edit the filename or URL for the selected active style"
 msgstr "ファイル名または選択した有効なスタイルのURLを編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:491
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:508
 msgid "Add the selected available styles to the list of active styles"
 msgstr "選択したスタイルを有効なスタイルに追加する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:514
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:531
 #, java-format
 msgid "Reloads the list of available styles from ''{0}''"
 msgstr "''{0}'' から有効なスタイルの一覧を再読み込み"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:642
 msgid "Add a new icon path"
 msgstr "新しいアイコンパスを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:638
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:655
 msgid "Remove the selected icon paths"
 msgstr "選択されたアイコンパスを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:659
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:676
 msgid "Edit the selected icon path"
 msgstr "選択されたアイコンパスを編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:704
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:721
 #, java-format
 msgid "Loading style sources from ''{0}''"
 msgstr "''{0}'' からスタイルソースをロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:726
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:743
 #, java-format
 msgid ""
@@ -12129,15 +12078,57 @@
 "<html>''{0}'' からのスタイルソースのダウンロードに<br>失敗。<br><br>詳細 (未翻訳):<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:798
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
 msgstr "警告: スタイルリスト ''{0}'' 中に不正な形式のエントリ。入力値 ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#, java-format
+msgid ""
+"Could not read tagging preset source: {0}\n"
+"Do you want to keep it?"
+msgstr ""
+
+#. Should not happen, but at least show message
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:83
+#, java-format
+msgid "Could not read tagging preset source {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:87
+#, java-format
+msgid ""
+"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
+"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
+"{3}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#, java-format
+msgid ""
+"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
+"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
+#, java-format
+msgid ""
+"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
+"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:101
+#, java-format
+msgid ""
+"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
+"it?<br><br><table width=600>Error is: {1}</table></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:133
 msgid "Sort presets menu"
 msgstr "プリセットメニューの並び替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:145
 msgid "Tagging Presets"
 msgstr "タグ付けプリセット"
@@ -12509,43 +12500,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:561
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 msgid "Available roles"
 msgstr "利用可能なロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
 msgid "role"
 msgstr "ロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:564
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566
 msgid "elements"
 msgstr "エレメント"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:672
 msgid "closedway"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:745
 msgid "Preset role element without parent"
 msgstr "親の無いロール要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:748
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:753
 msgid "Preset sub element without parent"
 msgstr "親の無いサブ要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12555,15 +12546,15 @@
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:786
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:796
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:828
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:838
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:891
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:901
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12572,17 +12563,17 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:894
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:896
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:906
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:904
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:914
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:979
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:989
 msgid "Change Properties"
 msgstr "プロパティを変更する"
@@ -13296,5 +13287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
-#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
+#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -14781,4 +14772,188 @@
 msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません"
 
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
+msgid "Align Way Segments"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
+msgid ""
+"Makes a pair of selected way segments parallel by rotating one of them "
+"around a chosen pivot."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
+msgid "Align Ways"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
+msgid ""
+"You cannot align connected segments.\n"
+"Please select two segments that don''t share any nodes."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
+msgid "AlignWayS message"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
+msgid ""
+"Aligning would result nodes outside the world.\n"
+"Your action is being reverted."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
+msgid "I''m ready!"
+msgstr ""
+
+#. JDialog tipDialog = tipPane.createDialog(null, tr("AlignWays Tips"));
+#. Take Main.map as frame as it's better to inherit its icon than the default Java cup
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:167
+msgid "AlignWays Tips"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:172
+msgid "Align way segment"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "パラメータの ''{0}'' はヌルではいけません"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:54
+msgid ""
+"<html>\n"
+"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
+"italic;\">\n"
+"<span style=\"font-size: large;\">Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> "
+"Plugin...</span>\n"
+"</div>\n"
+"</html>"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:79
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:86
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span "
+"style=\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:90
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:94
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing nearby. "
+"\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span "
+"style=\"color:green\">Shift-A</span></i></b>. Alternatively you''ll find the "
+"command in the <b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+msgid "Don''t show this again"
+msgstr "次回は表示しない"
+
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
 msgid "Building address"
@@ -16271,21 +16446,22 @@
 msgstr "イメージを取得できませんでした"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:149
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:171
+msgid "Not connected"
+msgstr "接続していません"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:162
+msgid "Connection Failed"
+msgstr "接続失敗"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:192
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:208
 msgid "Connecting"
 msgstr "接続中です"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:212
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:233
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:248
 msgid "Connected"
 msgstr "接続しました"
-
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:226
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:253
-msgid "Not connected"
-msgstr "接続していません"
-
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:241
-msgid "Connection Failed"
-msgstr "接続失敗"
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:129
@@ -17039,14 +17215,28 @@
 msgstr "履歴データを準備中..."
 
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 msgid "Revert changeset"
 msgstr "変更セットを元に戻す"
 
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:47
 msgid "Reverting..."
 msgstr "元に戻しています..."
 
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:54
+msgid ""
+"This changeset have objects outside the downloaded area.\n"
+"It is needed to download them before reverting. Do you want to continue?"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:56
+msgid "Confirm"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:58
+msgid "Fetching missing primitives"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:71
 #, java-format
 msgid "Revert changeset #{0}"
@@ -17416,5 +17606,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:172
 msgid "delete outline way"
-msgstr ""
+msgstr "アウトラインウェイを削除"
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:192
@@ -17545,5 +17735,5 @@
 "In the following table you can edit the <strong>raw tags</strong> of the OSM "
 "relation representing this turn restriction."
-msgstr ""
+msgstr "下記表中で、あなたはこの方向転換制限を表わすOSMリレーションの<strong>生のタグ</strong>を編集できます。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -17551,5 +17741,5 @@
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
-msgstr ""
+msgstr "下記表中で、あなたはこの方向転換制限を表わすOSMリレーションの<strong>生のメンバー</strong>を編集できます。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
@@ -17559,9 +17749,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
 msgid "From:"
-msgstr ""
+msgstr "From:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
 msgid "To:"
-msgstr ""
+msgstr "To:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
@@ -17584,5 +17774,5 @@
 "Cannot add object ''{0}'' as relation member because it is deleted or "
 "invisible in layer ''{1}''"
-msgstr ""
+msgstr "オブジェクト ''{0}'' をリレーションメンバーとして追加できません。レイヤ ''{1}'' 内で削除済みまたは非表示です"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102
@@ -17596,9 +17786,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:167
 msgid "Move the selected relation members down by one position"
-msgstr ""
+msgstr "選択されたリレーションメンバーを下へひと目盛り移動"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:194
 msgid "Move the selected relation members up by one position"
-msgstr ""
+msgstr "選択されたリレーションメンバーを上へひと目盛り移動"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134
@@ -17608,5 +17798,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
 msgid "Edit the raw tags and members of this turn restriction"
-msgstr ""
+msgstr "この方向転換制限の生のタグとメンバーを編集"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141
@@ -17859,9 +18049,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177
 msgid "Move the selected vias down by one position"
-msgstr ""
+msgstr "選択された経由地を下へひと目盛り移動"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:203
 msgid "Move the selected vias up by one position"
-msgstr ""
+msgstr "選択された経由地を上へひと目盛り移動"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:231
@@ -17883,20 +18073,20 @@
 msgctxt "turnrestrictions"
 msgid "From:"
-msgstr ""
+msgstr "From:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:136
 msgctxt "turnrestriction"
 msgid "To:"
-msgstr ""
+msgstr "To:"
 
 #. FIXME: render as warning/error (red background?)
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:173
 msgid "no participating way with role ''from''"
-msgstr ""
+msgstr "ロール \"from\" に参加しているウェイはありません"
 
 #. FIXME: render as warning/error (red background?)
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:183
 msgid "no participating way with role ''to''"
-msgstr ""
+msgstr "ロール \"to\" に参加しているウェイはありません"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:104
@@ -18029,5 +18219,5 @@
 msgctxt "keyboard-modifiers"
 msgid "Meta"
-msgstr ""
+msgstr "Meta"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29
@@ -18042,17 +18232,17 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
 msgid "Delete ''from''"
-msgstr ""
+msgstr "''from'' を削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38
 msgid "Removes the member with role ''from''"
-msgstr ""
+msgstr "ロール''from''のメンバーを削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
 msgid "Delete ''to''"
-msgstr ""
+msgstr "''to'' を削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
 msgid "Removes the member with role ''to''"
-msgstr ""
+msgstr "ロール''to''のメンバーを削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57
@@ -18129,5 +18319,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
 msgid "Add in editor"
-msgstr ""
+msgstr "エディタ内で追加"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
@@ -18283,9 +18473,9 @@
 msgstr "妥当性検証エラー"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:172
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:174
 msgid "Grid"
 msgstr "グリッド"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
 #, java-format
 msgid ""
@@ -18539,35 +18729,55 @@
 
 #. group "Relations"
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
 #: build/trans_presets.java:3189
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:50
 msgid "This test checks if multipolygons are valid"
 msgstr "このテストはマルチポリゴンが適切かどうかチェックします"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:120
+msgid "Area style way is not closed"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
 msgid "No outer way for multipolygon"
 msgstr "マルチポリゴンに外側のウェイがありません"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:151
+msgid "No style in multipolygon relation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
+msgid "Style for inner way equals multipolygon"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
+msgid "Style for outer way mismatches"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:186
+msgid "No style for multipolygon"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:191
 msgid "Multipolygon is not closed"
 msgstr "マルチポリゴンが閉じられていません"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:140
-msgid "Multipolygon inner way is outside."
-msgstr "マルチポリゴンの内側のウェイが外にあります"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:143
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:213
+msgid "Multipolygon inner way is outside"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:216
 msgid "Intersection between multipolygon ways"
 msgstr "マルチポリゴンウェイ間の交差"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:154
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:227
 msgid "No useful role for multipolygon member"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:157
-msgid "Non-Way in multipolygon."
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:230
+msgid "Non-Way in multipolygon"
 msgstr ""
 
@@ -18716,23 +18926,23 @@
 msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:157
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
 msgid "Properties checker :"
 msgstr "プロパティチェッカー："
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:158
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:154
 msgid "This plugin checks for errors in property keys and values."
 msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:290
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:286
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr "タグチェッカーライン - {0}: {1}　が不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:303
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:299
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr "スペルチェック行 {0}が不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:314
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:310
 #, java-format
 msgid ""
@@ -18743,104 +18953,98 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:451
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:452
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:458
 msgid "Illegal tag/value combinations"
 msgstr "不正なタグ/値の組み合わせです"
 
-#. passing translated text also to original string, as we already
-#. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:477
-msgid "Painting problem"
-msgstr "色つけに問題発生"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "キー ''{0}''は不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:492
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
 msgid "Tag value contains character with code less than 0x20"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:498
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
 msgid "Tag key contains character with code less than 0x20"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:504
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
 msgid "Tag value longer than allowed"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:510
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:491
 msgid "Tag key longer than allowed"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:516
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
 msgid "Tags with empty values"
 msgstr "値のないタグ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:522
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:503
 msgid "Invalid property key"
 msgstr "プロパティキーが不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:528
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509
 msgid "Invalid white space in property key"
 msgstr "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:534
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:515
 msgid "Property values start or end with white space"
 msgstr "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:540
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:567
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "キー ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:568
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549
 msgid "Presets do not contain property key"
 msgstr "プリセットはプロパティキーを含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:590
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:571
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:591
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:572
 msgid "Presets do not contain property value"
 msgstr "プリセットに含まれていない属性値です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:650
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
 msgid "Check property keys."
 msgstr "プロパティのキーをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "ワードのリストをチェックしてプロパティキーが正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:658
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
 msgid "Use complex property checker."
 msgstr "高度なプロパティチェッカーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
 msgid "Validate property values and tags using complex rules."
 msgstr "混合ルールを使用しているプロパティの値とタグを検証"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:658
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:680
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:681
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
 msgid "TagChecker source"
 msgstr "タグチェッカーのソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 msgid ""
 "The sources (URL or filename) of spell check (see "
@@ -18852,93 +19056,142 @@
 "またはタグをチェックするデータファイル。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Add a new source to the list."
 msgstr "新しいソースをリストに追加"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
 msgid "Edit the selected source."
 msgstr "選択したソースの編集"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:723
 msgid "Delete the selected source from the list."
 msgstr "リストから選択した情報源を削除"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Data sources"
 msgstr "データソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:768
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Check property values."
 msgstr "プロパティの値をチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
 msgid "Validate that property values are valid checking against presets."
 msgstr "プリセットをチェックしてプロパティの値が正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:776
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Check for FIXMES."
 msgstr "FIXMEをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:777
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "プロパティの値としてFIXMEをもつノードやウェイを検索"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:784
-msgid "Check for paint notes."
-msgstr "Check for paint notes."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:785
-msgid "Check if map painting found data errors."
-msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:792
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:761
 msgid "Use default data file."
 msgstr "既定のデータファイルを使用。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:793
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:762
 msgid "Use the default data file (recommended)."
 msgstr "既定のデータファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:796
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
 msgid "Use default tag ignore file."
 msgstr "デフォルトタグを使用、ファイルを無視。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:797
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:766
 msgid "Use the default tag ignore file (recommended)."
 msgstr "デフォルトタグを使用、ファイルを無視（推奨）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:800
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769
 msgid "Use default spellcheck file."
 msgstr "既定のスペルチェックファイルを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:801
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:770
 msgid "Use the default spellcheck file (recommended)."
 msgstr "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:895
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:862
 msgid "Fix properties"
 msgstr "プロパティを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1010
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977
 msgid "Could not find element type"
 msgstr "要素タイプを見つけられませんでした。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1012
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:979
 msgid "Incorrect number of parameters"
 msgstr "パラメータの数が不正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1030
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:997
 msgid "Could not find warning level"
 msgstr "警告レベルを見つけられませんでした"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1039
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1006
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不正な表現\"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1043
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1010
 #, java-format
 msgid "Illegal regular expression ''{0}''"
 msgstr "不正な正規表現： \"{0}\""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:35
+msgid "Turnrestriction"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:36
+msgid "This test checks if turnrestrictions are valid"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:103
+msgid "Unknown role"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:107
+msgid "Unknown member type"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:113
+msgid "More than one \"from\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:115
+msgid "More than one \"to\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:117
+msgid "More than one \"via\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:120
+msgid "No \"from\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:124
+msgid "No \"to\" way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:128
+msgid "No \"via\" node or way found"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:138
+msgid "The \"from\" way does not start or end at a \"via\" node"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:143
+msgid "The \"to\" way does not start or end at a \"via\" node"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:176
+msgid "The \"from\" way does not start or end at a \"via\" way."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:181
+msgid "The \"to\" way does not start or end at a \"via\" way."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
@@ -19781,16 +20034,17 @@
 msgstr ""
 
+#. File ../plugins/alignways/build.xml had no data
 #. Plugin buildings_tools
-#: build/trans_plugins.java:5
+#: build/trans_plugins.java:6
 msgid "Tools for drawing buildings."
 msgstr "建物描画用ツール"
 
 #. Plugin cadastre-fr
-#: build/trans_plugins.java:7
+#: build/trans_plugins.java:8
 msgid "A special handler for the French land registry WMS server."
 msgstr "フランス土地台帳WMS server 用の特別なハンドラ。"
 
 #. Plugin colorscheme
-#: build/trans_plugins.java:9
+#: build/trans_plugins.java:10
 msgid ""
 "Allows the user to create different color schemes and to switch between "
@@ -19804,10 +20058,10 @@
 
 #. Plugin Create_grid_of_ways
-#: build/trans_plugins.java:11
+#: build/trans_plugins.java:12
 msgid "Create a grid of ways."
 msgstr "ウェイのグリッドを作成。"
 
 #. Plugin czechaddress
-#: build/trans_plugins.java:13
+#: build/trans_plugins.java:14
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
@@ -19815,10 +20069,10 @@
 
 #. Plugin dataimport
-#: build/trans_plugins.java:15
+#: build/trans_plugins.java:16
 msgid "Allows to import various file formats into JOSM directly."
 msgstr "様々なフォーマットのファイルを JOSM に直接インポートできるようにします。"
 
 #. Plugin DirectUpload
-#: build/trans_plugins.java:17
+#: build/trans_plugins.java:18
 msgid ""
 "This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -19827,10 +20081,10 @@
 
 #. Plugin Duplicate-Way
-#: build/trans_plugins.java:19
+#: build/trans_plugins.java:20
 msgid "Duplicate Ways with an offset"
 msgstr "オフセットのあるウェイを複製"
 
 #. Plugin editgpx
-#: build/trans_plugins.java:21
+#: build/trans_plugins.java:22
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -19839,5 +20093,5 @@
 
 #. Plugin globalsat
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:24
 msgid ""
 "Download GPS points from Globalsat dg100 data logger directly in JOSM."
@@ -19845,15 +20099,15 @@
 
 #. Plugin graphview
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:26
 msgid "Visualizes routing information as a routing graph."
 msgstr "ルーティング情報をルーティンググラフとして可視化する。"
 
 #. Plugin grid
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:28
 msgid "Provide a background layer that displays a map grid"
 msgstr "地図グリッドを表示する背景レイヤーを提供します。"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:30
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -19865,10 +20119,10 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:32
 msgid "Helps vectorizing WMS images."
 msgstr "WMS イメージのベクトル化を支援する"
 
 #. Plugin livegps
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:34
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -19876,5 +20130,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:36
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -19884,15 +20138,15 @@
 
 #. Plugin michigan_left
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:38
 msgid "Adds no left turn for sets of 4 or 5 ways"
 msgstr "4 または5のウェイのセットに左折禁止を追加"
 
 #. Plugin multipoly-convert
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:40
 msgid "Simply convert an area to a multipolygon."
 msgstr "単純にエリアをマルチポリゴンに変換します。"
 
 #. Plugin multipoly
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:42
 msgid ""
 "Create multipolygons by one click, much easier than standard way with "
@@ -19901,5 +20155,5 @@
 
 #. Plugin nearclick
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:44
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -19911,15 +20165,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:46
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:48
 msgid "Imports issues from OpenStreetBugs"
 msgstr "OpenStreetBugs のバグ情報を読んだり、新たにバグを報告したりできるようにします。"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:50
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -19927,5 +20181,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:52
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -19933,5 +20187,5 @@
 
 #. Plugin photo_geotagging
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:54
 msgid ""
 "Write gps position info to the image file header. Run this feature from the "
@@ -19940,5 +20194,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:56
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -19947,10 +20201,10 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:58
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. Plugin public_transport
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:60
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
@@ -19958,15 +20212,15 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:62
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin reverter
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:64
 msgid "Plugin for reverting changesets"
 msgstr "変更セットを元に戻すプラグイン"
 
 #. Plugin routes
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:66
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -19977,10 +20231,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:68
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:70
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -19989,15 +20243,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:72
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPS位置上にマーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:74
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:76
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -20009,10 +20263,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:78
 msgid "Make terraced houses out of single blocks."
 msgstr "1つのブロックからテラスハウスを作成する"
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:80
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20021,5 +20275,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:82
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20028,5 +20282,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:84
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20035,10 +20289,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:86
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. Plugin validator
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:88
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20047,5 +20301,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:90
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20055,5 +20309,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:92
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20064,15 +20318,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:94
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:96
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:98
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20081,5 +20335,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:100
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20150,5 +20404,5 @@
 #. are supplied, then "values" will be treated as "display_values" and translated instead.
 #. -->
-#. <annotations>
+#. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
 #: build/trans_presets.java:77
 msgid "Highways"
@@ -22140,5 +22394,5 @@
 
 #. item "Barriers/Cycle Barrier"
-#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
 #: build/trans_presets.java:762
@@ -22200,5 +22454,4 @@
 #. item "Barriers/Border Control" check "Motorcar"
 #. <separator/>
-#. 
 #. <!-- *** linear barriers *** -->
 #: build/trans_presets.java:817
@@ -22249,5 +22502,4 @@
 #. <key key="barrier" value="retaining_wall" />
 #. <separator/>
-#. 
 #. <!-- *** access *** -->
 #: build/trans_presets.java:839
@@ -22344,5 +22596,4 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#. 
 #. group "Water"
 #. item "Water/Water/River" combo "Layer"
@@ -32731,4 +32982,22 @@
 #~ msgstr "リレーションに登録すべきものがありません。"
 
+#, java-format
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "不明なロール\"{0}\"です。"
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "\"from\"ウェイが見つかりません"
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "\"to\"ウェイが見つかりません"
+
+#, java-format
+#~ msgid "Error: {0}"
+#~ msgstr "Error: {0}"
+
+#, java-format
+#~ msgid "Warning: {0}"
+#~ msgstr "Warning: {0}"
+
 #~ msgid "Email"
 #~ msgstr "Email"
@@ -32752,4 +33021,10 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "TCXファイルをインポート"
+
+#~ msgid "Painting problem"
+#~ msgstr "色つけに問題発生"
+
+#~ msgid "Check for paint notes."
+#~ msgstr "Check for paint notes."
 
 #~ msgid "Show Tile Status"
@@ -32966,4 +33241,8 @@
 #~ msgid_plural "Downloaded plugin information from {0} sites"
 #~ msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
+
+#, java-format
+#~ msgid "Unknown member type for ''{0}''."
+#~ msgstr "{0}のメンバーのタイプが不明"
 
 #~ msgid ""
@@ -33023,4 +33302,14 @@
 #~ msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "二つ以上の\"from\"ウェイがあります。"
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "二つ以上の\"to\"ウェイがあります。"
+
+#, java-format
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "制約条件{0}のスタイルがありません。"
+
 #, java-format
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
@@ -33133,4 +33422,7 @@
 #~ msgstr "新しいタグプリセット源をリストに追加する。"
 
+#~ msgid "More than one \"via\" found."
+#~ msgstr "経由地が複数有ります。"
+
 #~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 #~ msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
@@ -33188,4 +33480,8 @@
 
 #, java-format
+#~ msgid "Style for inner way ''{0}'' equals multipolygon."
+#~ msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
+
+#, java-format
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
@@ -33292,4 +33588,8 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
+
+#, java-format
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
 
 #, java-format
@@ -33661,4 +33961,7 @@
 #~ "found."
 #~ msgstr "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が見つかりません。"
+
+#~ msgid "Check if map painting found data errors."
+#~ msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
 #, java-format
@@ -33911,4 +34214,10 @@
 #~ msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
 
+#~ msgid "No \"via\" node or way found."
+#~ msgstr "経由地かウェイが見つかりません。"
+
+#~ msgid "Area style way is not closed."
+#~ msgstr "領域を指定するウェイが閉じていません。"
+
 #, java-format
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
@@ -33934,8 +34243,4 @@
 #~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
 #~ msgstr "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないからです。"
-
-#, java-format
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "パラメータの ''{0}'' はヌルではいけません"
 
 #~ msgid "Footway"
@@ -34108,4 +34413,16 @@
 #~ msgstr "警告: 現在のJOSMユーザ用のユーザ情報の参照に失敗。例外コード: {0}"
 
+#~ msgid "The \"from\" way does not start or end at a \"via\" node."
+#~ msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
+
+#~ msgid "The \"to\" way does not start or end at a \"via\" node."
+#~ msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
+
+#~ msgid "The \"from\" way does not start or end at the \"via\" way."
+#~ msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
+
+#~ msgid "The \"to\" way does not start or end at the \"via\" way."
+#~ msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
+
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 #~ msgstr "<html>ディレクトリを開けません。<br>ファイルを選択してください！</html>"
@@ -34123,4 +34440,7 @@
 #~ msgid "Execute Script"
 #~ msgstr "スクリプトを実行"
+
+#~ msgid "Multipolygon inner way is outside."
+#~ msgstr "マルチポリゴンの内側のウェイが外にあります"
 
 #~ msgid "nice Plugin"