Index: menu.xml.vi
===================================================================
--- menu.xml.vi	(revision 14263)
+++ menu.xml.vi	(working copy)
@@ -41,7 +41,7 @@
   + Gồm các tập tin khác:
     <include type="file" src="menu2.xml" visible="true" />
     Gồm tập tin menu2.xml.  Đường dẫn tương đối được giả định là có gốc ở
-    ~/.xfce4/.  Đường dẫn tuyệt đối được đối xử như chính nó.
+    ~/.config/xfce4/desktop/.  Đường dẫn tuyệt đối được đối xử như chính nó.
     
   + Gồm thực đơn hệ thống tự phát sinh:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.ro
===================================================================
--- menu.xml.ro	(revision 14263)
+++ menu.xml.ro	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.ca
===================================================================
--- menu.xml.ca	(revision 14263)
+++ menu.xml.ca	(working copy)
@@ -44,7 +44,7 @@
   + Incloure altres fitxers:
     <include type="file" src="menu2.xml" visible="true" />
     Afegeix el fitxer «menu2.xml». Es pot suministrar una adreça relativa a
-    ~/.xfce4/.  Una dreça absoluta serà tractada com a tal.
+    ~/.config/xfce4/desktop/.  Una dreça absoluta serà tractada com a tal.
 
   + Incloure un menú del sistema autogenerat:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.ru
===================================================================
--- menu.xml.ru	(revision 14263)
+++ menu.xml.ru	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.zh_TW
===================================================================
--- menu.xml.zh_TW	(revision 14263)
+++ menu.xml.zh_TW	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: modules/menu/xfce-registered-categories.xml.ru
===================================================================
--- modules/menu/xfce-registered-categories.xml.ru	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml.ru	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xfce-registered-categories>
 
-<!-- Note: You can copy this file to ~/.xfce4/ for customisation. -->
+<!-- Note: You can copy this file to ~/config/.xfce4/desktop/ for customisation. -->
 
 <!--
 	Here is how this file works:
-	
+
 	<xfce-registered-categories> - root element, required.
-	
+
 	<category>
 		name:  Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
@@ -22,7 +22,7 @@
 		  items. (default: false)
 		hide: Optional.  Items referencing this category will not appear in any
 			menu. (default: false)
-			
+
 	<subcategory> - sub-element of <category>, specifies a subcategory relation
 		name: Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
Index: modules/menu/xfce-registered-categories.xml.ja
===================================================================
--- modules/menu/xfce-registered-categories.xml.ja	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml.ja	(working copy)
@@ -1,38 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xfce-registered-categories>
 
-<!-- 備考: カスタマイズする方はこのファイルを ~/.xfce4/ へコピーして下さい。 -->
+<!--
+    翻訳者:
 
+        Daichi Kawahata <daichik@users.sourceforge.net>, 2005.
+
+    誤訳の指摘・改訳の提案等は:
+
+        xfce-users-jp <xfce-users-jp@ml.fdiary.net>
+        Xfce translations mailing list <xfce-i18n@xfce.org> (英語のみ)
+-->
+
 <!--
-	Here is how this file works:
+    備考: カスタマイズする方は、このファイルを ~/.config/xfce4/desktop/
+    へコピーして下さい。
+-->
 
+<!--
+    このファイルの書式は:
+
 	<xfce-registered-categories> - ルート要素、必須です。
 
 	<category>
-        name:  必須です。freedesktop.org のメニュー仕様にある公式カテゴリー
-          に対応してます。
+        name: 必須です。freedesktop.org のメニュー仕様にある公式カテゴリー
+          に対応しています。
         replace: 任意です。カテゴリーでアイテムのメニュー名として表示される
           名前です (例えば翻訳等で役立ちます)。
-        icon: このカテゴリーに表示されるアイコンです (実際にはカテゴリーの
+        icon: このカテゴリーに表示されるアイコンです (実際には、カテゴリーの
           'replace' 属性が参照するメニューです)。
-		toplevel: Optional.  Marks categories as being "allowed" to be toplevel
-		  menus.  Note: if a category is unrooted, it will be promoted to
-		  toplevel regardless of the value of this attribute. (default: false)
-		ignore: Optional.  This category will be ignored when organising menu
-		  items. (default: false)
-        hide: 任意です。このカテゴリーを参照するアイテムはどのメニューにも
+        toplevel: 任意です。カテゴリーが最上部のメニューになれるようマーク
+          します。備考: カテゴリーがルートではない場合、この属性の値に関わらず
+          最上部にされます。(標準: false)
+        ignore: 任意です。このカテゴリーはメニュー・アイテムを一つのグループに
+        まとめる時に無視されます。(標準: false)
+        hide: 任意です。このカテゴリーを参照するアイテムは、どのメニューにも
           表示されません。(デフォルト: false)
 
-	<subcategory> - sub-element of <category>, specifies a subcategory relation
-		name: Required.  Corresponds to an official category from the
-		  freedesktop.org menu spec.
+    <subcategory> - <category> のサブ要素です、サブカテゴリーに関連する名前を
+        指定します: 必須です。freedesktop.org のメニュー仕様にある公式カテゴリー
+          に対応します。
       例:
 	  <category name="Graphics">
 		  <subcategory name="RasterGraphics">
 	  </category>
-	  Note that even if subcategories are definied, it is possible to collapse
-	  all subcategories into a flat one-level menu by specifying style="simple"
-	  in the <include> tag in your menu.xml file.
+      サブ・カテゴリーが定義されている場合でも、あなたの menu.xml ファイルにある
+      <include> タグで style="simple" を指定する事により、全てのサブ・カテゴリー
+      を一つのレベルのメニューに畳むことが可能です。
 -->
 
 <xfce-registered-categories>
@@ -121,7 +135,7 @@
 	<category name="Network" toplevel="true" replace="ネットワーク" builtin-icon="NETWORK">
 		<subcategory name="Email" replace="電子メール" />
 		<subcategory name="Dialup" replace="ダイアルアップ" />
-		<subcategory name="InstantMessaging" replace="インスタントメッセージ" />
+		<subcategory name="InstantMessaging" replace="インスタント・メッセージ" />
 		<subcategory name="IRCClient" replace="IRC クライアント" />
 		<subcategory name="FileTransfer" replace="ファイル転送" />
 		<subcategory name="HamRadio" replace="ハムラジオ" />
@@ -129,11 +143,11 @@
 		<subcategory name="P2P" />
 		<subcategory name="RemoteAccess" replace="遠隔アクセス" />
 		<subcategory name="Telephony" replace="IP 電話" />
-		<subcategory name="WebBrowser" replace="ウェブブラウザ" />
+		<subcategory name="WebBrowser" replace="ウェブ・ブラウザ" />
 		<subcategory name="WebDevelopment" replace="ウェブ開発" />
 	</category>
 	<category name="Dialup" replace="ダイアルアップ" builtin-icon="NETWORK" />
-	<category name="InstantMessaging" replace="インスタントメッセージ" builtin-icon="NETWORK" />
+	<category name="InstantMessaging" replace="インスタント・メッセージ" builtin-icon="NETWORK" />
 	<category name="IRCClient" replace="IRC クライアント" builtin-icon="NETWORK" />
 	<category name="FileTransfer" replace="ファイル転送" builtin-icon="NETWORK" />
 	<category name="HamRadio" replace="ハムラジオ" builtin-icon="NETWORK" />
@@ -150,7 +164,7 @@
 		<subcategory name="Video" replace="ビデオ" />
 		<subcategory name="AudioVideoEditing" />
 		<subcategory name="Player" replace="プレイヤー" />
-		<subcategory name="Recorder" />
+		<subcategory name="Recorder" replace="レコーダー" />
 		<subcategory name="DiscBurning" />
 	</category>
 	<category name="Audio" replace="オーディオ" builtin-icon="MULTIMEDIA">
@@ -160,7 +174,7 @@
 		<subcategory name="Tuner" replace="チューナー" />
 		<subcategory name="AudioVideoEditing" />
 		<subcategory name="Player" replace="プレイヤー" />
-		<subcategory name="Recorder" />
+		<subcategory name="Recorder" replace="レコーダー" />
 	</category>
 	<category name="Midi"  replace="MIDI" builtin-icon="MULTIMEDIA" />
 	<category name="Mixer" replace="サウンドミキサー" builtin-icon="MULTIMEDIA" />
@@ -170,8 +184,8 @@
 		<subcategory name="TV" replace="テレビ" />
 		<subcategory name="AudioVideoEditing" />
 		<subcategory name="Player" repace="プレイヤー" />
-		<subcategory name="Recorder" />
-		<subcategory name="Music" />
+		<subcategory name="Recorder" replace="レコーダー" />
+		<subcategory name="Music" replace="音楽" />
 	</category>
 	<category name="TV" replace="テレビ" builtin-icon="MULTIMEDIA" />
 	<category name="AudioVideoEditing" replace="Editing" builtin-icon="MULTIMEDIA" />
@@ -241,17 +255,17 @@
 	<category name="FileManager" replace="ファイル管理" />
 	<category name="Shell" replace="シェル" />
 	<category name="Screensaver" replace="スクリーンセーバ" />
-	<category name="TerminalEmulator" replace="ターミナルエミュレータ" />
+	<category name="TerminalEmulator" replace="ターミナル・エミュレータ" />
 	<category name="TrayIcon" replace="システムトレイアイコン" />
 	<category name="System" toplevel="true" replace="システム" builtin-icon="SYSTEM">
-		<subcategory name="FileSystem" replace="ファイルシステム" />
+		<subcategory name="FileSystem" replace="ファイル・システム" />
 		<subcategory name="Monitor" replace="モニタ" />
 		<subcategory name="Security" replace="セキュリティ" />
 		<subcategory name="Accessibility" />
-		<subcategory name="TerminalEmulator" replace="ターミナルエミュレータ" />
+		<subcategory name="TerminalEmulator" replace="ターミナル・エミュレータ" />
 		<subcategory name="Shell" replace="シェル" />
 	</category>
-	<category name="Filesystem" replace="ファイルシステム" builtin-icon="SYSTEM" />
+	<category name="Filesystem" replace="ファイル・システム" builtin-icon="SYSTEM" />
 	<category name="Monitor" replace="モニタ" builtin-icon="SYSTEM" />
 	<category name="Security" replace="セキュリティ" builtin-icon="SYSTEM" />
 	<category name="Utility"  toplevel="true" replace="アクセサリー" builtin-icon="UTILITY">
@@ -260,8 +274,8 @@
 		<subcategory name="Clock" replace="時計" />
 		<subcategory name="TextEditor" replace="テキストエディタ" />
 		<subcategory name="Archiving" replace="アーカイブ作成" />
-		<subcategory name="TerminalEmulator" replace="ターミナルエミュレータ" />
-		<subcategory name="FileManager" replace="ファイルマネージャ" />
+		<subcategory name="TerminalEmulator" replace="ターミナル・エミュレータ" />
+		<subcategory name="FileManager" replace="ファイル・マネージャ" />
 		<subcategory name="Shell" replace="シェル" />
 	</category>
 	<category name="Accessibility" builtin-icon="UTILITY" />
Index: modules/menu/xfce-registered-categories.xml.zh_TW
===================================================================
--- modules/menu/xfce-registered-categories.xml.zh_TW	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml.zh_TW	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xfce-registered-categories>
 
-<!-- Note: You can copy this file to ~/.xfce4/ for customisation. -->
+<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
 
 <!--
 	Here is how this file works:
-	
+
 	<xfce-registered-categories> - root element, required.
-	
+
 	<category>
 		name:  Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
@@ -22,7 +22,7 @@
 		  items. (default: false)
 		hide: Optional.  Items referencing this category will not appear in any
 			menu. (default: false)
-			
+
 	<subcategory> - sub-element of <category>, specifies a subcategory relation
 		name: Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
Index: modules/menu/xfce-registered-categories.xml.fi
===================================================================
--- modules/menu/xfce-registered-categories.xml.fi	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml.fi	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xfce-registered-categories>
 
-<!-- Huomaa: Voit kopioida tiedoston kansioon ~/.xfce4/ muokkausta varten. -->
+<!-- Huomaa: Voit kopioida tiedoston kansioon ~/.config/xfce4/desktop/ muokkausta varten. -->
 
 <!--
 	Näin tämä tiedosto toimii:
-	
+
 	<xfce-registered-categories> - juurielementti, pakollinen.
-	
+
 	<category>
 		name:  Pakollinen.  Vastaa virallista kategoriaa freedesktop.org:in
 		valikkospesifikaatiossa.
@@ -22,7 +22,7 @@
 		  järjestettäessä. (oletus: false)
 		hide: Valinnainen.  Tähän kategoriaan viittaavia kohtia ei näytetä
 		  missään valikossa. (oletus: false)
-			
+
 	<subcategory> - <category>:n alielementti, määrittää alikategoriasuhteen
 		name: Pakollinen.  Vastaa virallista kategoriaa freedesktop.org:in
 		valikkospesifikaatiossa.
Index: modules/menu/xfce-registered-categories.xml
===================================================================
--- modules/menu/xfce-registered-categories.xml	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xfce-registered-categories>
 
-<!-- Note: You can copy this file to ~/.xfce4/ for customisation. -->
+<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
 
 <!--
 	Here is how this file works:
-	
+
 	<xfce-registered-categories> - root element, required.
-	
+
 	<category>
 		name:  Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
@@ -22,7 +22,7 @@
 		  items. (default: false)
 		hide: Optional.  Items referencing this category will not appear in any
 			menu. (default: false)
-			
+
 	<subcategory> - sub-element of <category>, specifies a subcategory relation
 		name: Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
Index: modules/menu/xfce-registered-categories.xml.zh_CN
===================================================================
--- modules/menu/xfce-registered-categories.xml.zh_CN	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml.zh_CN	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xfce-registered-categories>
 
-<!-- Note: You can copy this file to ~/.xfce4/ for customisation. -->
+<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
 
 <!--
 	Here is how this file works:
-	
+
 	<xfce-registered-categories> - root element, required.
-	
+
 	<category>
 		name:  Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
@@ -22,7 +22,7 @@
 		  items. (default: false)
 		hide: Optional.  Items referencing this category will not appear in any
 			menu. (default: false)
-			
+
 	<subcategory> - sub-element of <category>, specifies a subcategory relation
 		name: Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
Index: modules/menu/xfce-registered-categories.xml.pt_BR
===================================================================
--- modules/menu/xfce-registered-categories.xml.pt_BR	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml.pt_BR	(working copy)
@@ -3,13 +3,13 @@
 
 <!-- Translated by Rodrigo Coacci (rcoacci@gmail.com) -->
 
-<!-- Note: You can copy this file to ~/.xfce4/ for customisation. -->
+<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
 
 <!--
 	Here is how this file works:
-	
+
 	<xfce-registered-categories> - root element, required.
-	
+
 	<category>
 		name:  Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
@@ -24,7 +24,7 @@
 		  items. (default: false)
 		hide: Optional.  Items referencing this category will not appear in any
 			menu. (default: false)
-			
+
 	<subcategory> - sub-element of <category>, specifies a subcategory relation
 		name: Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
Index: modules/menu/xfce-registered-categories.xml.nl
===================================================================
--- modules/menu/xfce-registered-categories.xml.nl	(revision 14263)
+++ modules/menu/xfce-registered-categories.xml.nl	(working copy)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xfce-registered-categories>
 
-<!-- Note: You can copy this file to ~/.xfce4/ for customisation. -->
+<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
 
 <!--
 	Here is how this file works:
-	
+
 	<xfce-registered-categories> - root element, required.
-	
+
 	<category>
 		name:  Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
@@ -22,7 +22,7 @@
 		  items. (default: false)
 		hide: Optional.  Items referencing this category will not appear in any
 			menu. (default: false)
-			
+
 	<subcategory> - sub-element of <category>, specifies a subcategory relation
 		name: Required.  Corresponds to an official category from the
 		  freedesktop.org menu spec.
Index: menu.xml.es
===================================================================
--- menu.xml.es	(revision 14263)
+++ menu.xml.es	(working copy)
@@ -39,7 +39,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.et
===================================================================
--- menu.xml.et	(revision 14263)
+++ menu.xml.et	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.ko
===================================================================
--- menu.xml.ko	(revision 14263)
+++ menu.xml.ko	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.sk
===================================================================
--- menu.xml.sk	(revision 14263)
+++ menu.xml.sk	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.uk
===================================================================
--- menu.xml.uk	(revision 14263)
+++ menu.xml.uk	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.ja
===================================================================
--- menu.xml.ja	(revision 14263)
+++ menu.xml.ja	(working copy)
@@ -2,6 +2,17 @@
 <!DOCTYPE xfdesktop-menu>
 
 <!--
+    翻訳者:
+
+        Daichi Kawahata <daichik@users.sourceforge.net>, 2005.
+
+    誤訳の指摘・改訳の提案等は:
+
+        xfce-users-jp <xfce-users-jp@ml.fdiary.net>
+        Xfce translations mailing list <xfce-i18n@xfce.org> (英語のみ)
+-->
+
+<!--
      Xfce 4 メニューファイルの説明:
      ==============================
      ここでメニューファイルの書式を説明しようと思います。以下の実際の
@@ -10,42 +21,54 @@
 
 -->
 
-<!-- 見て分かるように、コメントはこのように記述します ^_^ -->
+<!-- 御覧のように、コメントはこのように記述します ^_^ -->
 
 <!--
 
   + 全て一組の <xfdesktop-menu></xfdesktop-menu> タグの間に記述します。
 
   + アプリケーション:
+
     <app name="メニューでの名前" cmd="実行するコマンド" term="false"
          icon="アイコンファイル"  snotify="false" visible="true" />
+
     属性 'term' はプログラムの実行にターミナルが必要かどうかを決めます、
     'snotify' はプログラムが起動通知に対応するかどうかを設定します。
     属性 'icon' を付ける事で、アイテムの隣にアイコンを表示する事ができます。
     'name' と 'cmd' のみが必須です。
 
   + セパレータ:
+
     <separator visible="true" />
+
     水平セパレータを作成します。'visible' 属性は任意です。
 
   + サブメニュー:
+
     <menu name="メニューでの名前" icon="アイコンファイル" cisible="true"></menu>
-    'name' のみが必須ですが、属性 'icon' を付ける事で表示されるアイコンを設定
-    する事もできます。メニュータグの間では一つ以上のアプリケーション、
-    セパレータ及びメニューを指定する事ができます。
 
+    'name' のみが必須ですが、属性 'icon' を付ける事で表示されるアイコンを
+    設定できます。menu タグの間では、一つ以上のアプリケーション、セパレータ
+    及びメニューを指定する事ができます。
+
   + タイトル:
+
     <title name="メニューでの名前" icon="アイコンファイル" visible="true" />
+
     大文字・小文字の区別が無いメニュータイトルを作成します。望むなら、
-    任意のアイコンをタイトルへ追加する事さえできます。
+    任意のアイコンをタイトルへ追加する事もできます。
 
   + 他のファイルを組み込む:
+
     <include type="file" src="menu2.xml" visible="true" />
-    ファイル menu2.xml を組込みます。相対パスのルートは ~/.xfce4/ と
-    見なされます。絶対パスも、ルートが ~/.xfce4/ になってしまいます。
 
+    ファイル menu2.xml を組込みます。相対パスのルートは ~/.config/xfce4/desktop/ と
+    見なされます。絶対パスも、ルートが ~/.config/xfce4/desktop/ になってしまいます。
+
   + 自動生成されたシステムメニューを組み込む:
+
     <include type="system" style="simple" unique="true" visible="true" />
+
     システムメニューを組込みます。スタイルは "simple" 又は "multilevel" に
     なります。unique に "false" が設定されると、アプリケーションが複数に分類
     されている場合、それに応じた複数のメニューアイテムが生成されます。
@@ -62,8 +85,8 @@
 	<separator/>
 
 	<app name="ターミナル" cmd="xfterm4" icon="gnome-terminal"/>
-	<app name="ファイルマネージャ (xffm)" cmd="xffm" icon="file-manager"/>
-	<app name="ウェブブラウザ" cmd="mozilla" icon="gnome-globe"/>
+	<app name="ファイル・マネージャ (xffm)" cmd="xffm" icon="file-manager"/>
+	<app name="ウェブ・ブラウザ" cmd="mozilla" icon="gnome-globe"/>
 
 	<separator/>
 
@@ -81,7 +104,8 @@
 
 	<!--
           自動生成されたメニューを使用する代わりに別に分けたメニューファイルを
-          組み込みたいなら、以下の行のコメントを外して (上の行をコメントして) 下さい。
+          組み込みたいなら、以下の行のコメントを外して (上の行をコメントして)
+          下さい。
 	-->
 	<!-- <include type="file" src="menu2.xml"/> -->
 
Index: menu.xml.he
===================================================================
--- menu.xml.he	(revision 14263)
+++ menu.xml.he	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.fi
===================================================================
--- menu.xml.fi	(revision 14263)
+++ menu.xml.fi	(working copy)
@@ -42,7 +42,7 @@
   + Muiden tiedostojen sisällyttäminen:
     <include type="file" src="menu2.xml" visible="true/false" />
     Sisällyttää tiedoston menu2.xml. Suhteellisen polun oletetaan alkavan
-    kansiosta ~/.xfce4/. Absoluuttista polkua käsitellään normaalisti.
+    kansiosta ~/.config/xfce4/desktop/. Absoluuttista polkua käsitellään normaalisti.
     
   + Automaattisesti luodun järjestelmävalikon sisällyttäminen:
     <include type="system" style="simple" unique="true/false" visible="true/false" />
Index: menu.xml
===================================================================
--- menu.xml	(revision 14263)
+++ menu.xml	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.pt_BR
===================================================================
--- menu.xml.pt_BR	(revision 14263)
+++ menu.xml.pt_BR	(working copy)
@@ -44,7 +44,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.fr
===================================================================
--- menu.xml.fr	(revision 14263)
+++ menu.xml.fr	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />
Index: menu.xml.nl
===================================================================
--- menu.xml.nl	(revision 14263)
+++ menu.xml.nl	(working copy)
@@ -42,7 +42,7 @@
   + Including other files:
     <include type="file" src="menu2.xml" visible="true" />
     Includes the file menu2.xml.  A relative path is assumed to be rooted at
-    ~/.xfce4/.  An absolute path will be treated as such.
+    ~/.config/xfce4/desktop/.  An absolute path will be treated as such.
     
   + Including an autogenerated system menu:
     <include type="system" style="simple" unique="true" visible="true" />