diff --git a/po/ChangeLog b/po/ChangeLog
index 67e467d840d7896bee072b8c6e623a8e19828b72..20ef5523effcf7e5f9ef5dee8ffe43c5909bb398 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-27  Mike Massonnet <mmassonnet@xfce.org>
+
+	* ja.po: Update Japanese translation (Nobuhiro Iwamatsu)
+
 2008-05-13	Mike Massonnet <mmassonnet@xfce.org>
 
 	* en_GB.po: Update translation (Jeff Bailes)
diff --git a/po/ja.po b/po/ja.po
index c0e93b21c95bd4c114214801d4bf18efceac9de2..0a6f514c84234547f50c2d1415d82ffe9f4ae310 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,6 +5,7 @@
 # This file is distributed under the same license as the xfwm4 package.
 # Zhao Ji <zhao-ji@awz.ne.jp>, 2003.
 # Daichi Kawahata <daichi@xfce.org>, 2005-2007.
+# Nobuhiro Iwamatsu <iwamatsu@nigauri.org>, 2008.
 #
 # 対訳一覧:
 #
@@ -17,8 +18,8 @@ msgstr ""
 "Project-Id-Version: xfwm4 4.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-23 19:57+0100\n"
-"PO-Revision-Date: 2007-07-10 20:50+0900\n"
-"Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
+"PO-Revision-Date: 2008-05-20 06:26+0900\n"
+"Last-Translator: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,8 +30,7 @@ msgid "Workspace Margins"
 msgstr "ワークスペースの余白"
 
 #: ../mcs-plugin/margins.c:136
-msgid ""
-"Margins are areas on the edges of the screen where no window will be placed"
+msgid "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "余白とは画面端のウィンドウが置かれない空間のことです"
 
 #: ../mcs-plugin/margins.c:167
@@ -58,7 +58,8 @@ msgstr "ワークスペースと余白"
 msgid "Workspaces and Margins"
 msgstr "ワークスペースと余白"
 
-#: ../mcs-plugin/workspaces_plugin.c:162 ../mcs-plugin/wmtweaks_plugin.c:640
+#: ../mcs-plugin/workspaces_plugin.c:162
+#: ../mcs-plugin/wmtweaks_plugin.c:640
 #: ../mcs-plugin/workspaces.c:516
 msgid "Workspaces"
 msgstr "ワークスペース"
@@ -98,11 +99,8 @@ msgid "Window Manager Tweaks"
 msgstr "ウィンドウマネージャー (詳細)"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:512
-msgid ""
-"Skip windows that have \"skip pager\" or \"skip taskbar\" properties set"
-msgstr ""
-"「ページャーを飛ばす」または「タスクバーを飛ばす」というプロパティが設定され"
-"ているウィンドウを飛ばす"
+msgid "Skip windows that have \"skip pager\" or \"skip taskbar\" properties set"
+msgstr "「ページャーを飛ばす」または「タスクバーを飛ばす」というプロパティが設定されているウィンドウを飛ばす"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:518
 msgid "Include hidden (i.e. iconified) windows"
@@ -128,7 +126,8 @@ msgstr "ICCCM 標準フォーカスヒントに則る"
 msgid "When a window raises itself:"
 msgstr "ウィンドウ自身を前面に出す場合:"
 
-#: ../mcs-plugin/wmtweaks_plugin.c:558 ../mcs-plugin/xfwm4_plugin.c:1752
+#: ../mcs-plugin/wmtweaks_plugin.c:558
+#: ../mcs-plugin/xfwm4_plugin.c:1752
 msgid "Focus"
 msgstr "フォーカス"
 
@@ -163,8 +162,7 @@ msgid "Switch workspaces using the mouse wheel over the desktop"
 msgstr "デスクトップ上でマウスホイールを使用しながらワークスペースを切り替える"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:621
-msgid ""
-"Remember and recall previous workspace when switching via keyboard shortcuts"
+msgid "Remember and recall previous workspace when switching via keyboard shortcuts"
 msgstr "ショートカットを使用して切り替える時に以前のワークスペースを覚えておく"
 
 #: ../mcs-plugin/wmtweaks_plugin.c:628
@@ -226,15 +224,19 @@ msgid "Opacity of window decorations"
 msgstr "ウィンドウ枠の透明度"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
-#: ../mcs-plugin/wmtweaks_plugin.c:721 ../mcs-plugin/wmtweaks_plugin.c:727
-#: ../mcs-plugin/wmtweaks_plugin.c:733 ../mcs-plugin/wmtweaks_plugin.c:739
+#: ../mcs-plugin/wmtweaks_plugin.c:721
+#: ../mcs-plugin/wmtweaks_plugin.c:727
+#: ../mcs-plugin/wmtweaks_plugin.c:733
+#: ../mcs-plugin/wmtweaks_plugin.c:739
 #: ../mcs-plugin/wmtweaks_plugin.c:745
 msgid "Transparent"
 msgstr "透明"
 
 # FIXME: compositor won't work on irix, thus it's blind-translation
-#: ../mcs-plugin/wmtweaks_plugin.c:722 ../mcs-plugin/wmtweaks_plugin.c:728
-#: ../mcs-plugin/wmtweaks_plugin.c:734 ../mcs-plugin/wmtweaks_plugin.c:740
+#: ../mcs-plugin/wmtweaks_plugin.c:722
+#: ../mcs-plugin/wmtweaks_plugin.c:728
+#: ../mcs-plugin/wmtweaks_plugin.c:734
+#: ../mcs-plugin/wmtweaks_plugin.c:740
 #: ../mcs-plugin/wmtweaks_plugin.c:746
 msgid "Opaque"
 msgstr "不透明"
@@ -269,7 +271,8 @@ msgstr "コンポジット"
 msgid "Button Label|Window Manager Tweaks"
 msgstr "ウィンドウマネージャー (詳細)"
 
-#: ../mcs-plugin/wmtweaks_plugin.c:914 ../mcs-plugin/xfwm4_plugin.c:2430
+#: ../mcs-plugin/wmtweaks_plugin.c:914
+#: ../mcs-plugin/xfwm4_plugin.c:2430
 #, c-format
 msgid "These settings cannot work with your current window manager (%s)"
 msgstr "現在のウィンドウマネージャー (%s) ではこれらの設定が有効になりません"
@@ -278,7 +281,8 @@ msgstr "現在のウィンドウマネージャー (%s) ではこれらの設定
 msgid "Change name"
 msgstr "名前変更"
 
-#: ../mcs-plugin/workspaces.c:338 ../mcs-plugin/xfwm4_shortcuteditor.c:490
+#: ../mcs-plugin/workspaces.c:338
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:490
 #, c-format
 msgid "Workspace %d"
 msgstr "ワークスペース %d へ移る"
@@ -327,22 +331,25 @@ msgstr "最大化"
 msgid "Close"
 msgstr "閉じる"
 
-#: ../mcs-plugin/xfwm4_plugin.c:79 ../mcs-plugin/xfwm4_shortcuteditor.c:371
+#: ../mcs-plugin/xfwm4_plugin.c:79
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:371
 msgid "Shade window"
 msgstr "ウィンドウを折り畳む"
 
-#: ../mcs-plugin/xfwm4_plugin.c:80 ../mcs-plugin/xfwm4_shortcuteditor.c:370
+#: ../mcs-plugin/xfwm4_plugin.c:80
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:370
 msgid "Hide window"
 msgstr "ウィンドウを隠す"
 
-#: ../mcs-plugin/xfwm4_plugin.c:81 ../mcs-plugin/xfwm4_shortcuteditor.c:364
+#: ../mcs-plugin/xfwm4_plugin.c:81
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:364
 msgid "Maximize window"
 msgstr "ウィンドウの最大化"
 
-#: ../mcs-plugin/xfwm4_plugin.c:82 ../mcs-plugin/xfwm4_shortcuteditor.c:369
-#, fuzzy
+#: ../mcs-plugin/xfwm4_plugin.c:82
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:369
 msgid "Fill window"
-msgstr "ウィンドウを隠す"
+msgstr "ウィンドウを最大化する"
 
 #: ../mcs-plugin/xfwm4_plugin.c:83
 msgid "Nothing"
@@ -441,11 +448,13 @@ msgstr "マウスに従ってフォーカス"
 msgid "Delay before window receives focus"
 msgstr "ウィンドウがフォーカスされるまでの遅延時間"
 
-#: ../mcs-plugin/xfwm4_plugin.c:1654 ../mcs-plugin/xfwm4_plugin.c:1716
+#: ../mcs-plugin/xfwm4_plugin.c:1654
+#: ../mcs-plugin/xfwm4_plugin.c:1716
 msgid "Slow"
 msgstr "遅い"
 
-#: ../mcs-plugin/xfwm4_plugin.c:1661 ../mcs-plugin/xfwm4_plugin.c:1723
+#: ../mcs-plugin/xfwm4_plugin.c:1661
+#: ../mcs-plugin/xfwm4_plugin.c:1723
 msgid "Fast"
 msgstr "速い"
 
@@ -588,12 +597,10 @@ msgid "Maximize window horizontally"
 msgstr "ウィンドウを横に最大化する"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:367
-#, fuzzy
 msgid "Fill window horizontally"
 msgstr "ウィンドウを横に最大化する"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:368
-#, fuzzy
 msgid "Fill window vertically"
 msgstr "ウィンドウを縦に最大化する"
 
@@ -651,7 +658,7 @@ msgstr "ウィンドウを背面に隠す"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:385
 msgid "Toggle above"
-msgstr ""
+msgstr "上で切り替える"
 
 #: ../mcs-plugin/xfwm4_shortcuteditor.c:386
 msgid "Toggle fullscreen"
@@ -828,7 +835,8 @@ msgstr "剥す(_T)"
 msgid "Context _help"
 msgstr "コンテキストヘルプ(_H)"
 
-#: ../src/menu.c:50 ../src/menu.c:51
+#: ../src/menu.c:50
+#: ../src/menu.c:51
 msgid "Always on top"
 msgstr "常に前面へ"
 
@@ -902,3 +910,4 @@ msgstr "ワークスペース"
 #: ../mcs-plugin/xfce-workspaces-settings.desktop.in.h:2
 msgid "Xfce 4 Workspaces Settings"
 msgstr "Xfce 4 ワークスペースの設定"
+