sync with bb-cvs

diff --git a/nls/ja_JP/BaseDisplay.m b/nls/ja_JP/BaseDisplay.m
index a87fca5acdaa13fd5be3009c6c0bef11ad4ca559..fe15b800c9b25483d040d71757955ea9e926fad3 100644 (file)
--- a/nls/ja_JP/BaseDisplay.m
+++ b/nls/ja_JP/BaseDisplay.m
@@ -7,10 +7,10 @@ $ #SignalCaught
 $ #ShuttingDown
 # ½ªÎ»\n
 $ #Aborting
-# Ãæ»ß ... ¥³¥¢¥À¥ó¥×¤·¤Þ¤¹\n
+# Ãæ»ß ... ¥³¥¢¥À¥ó¥×Ãæ.\n
 $ #XConnectFail
 # BaseDisplay::BaseDisplay: X ¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ\n
 $ #CloseOnExecFail
-# BaseDisplay::BaseDisplay: couldn't mark display connection as close-on-exec\n
+# BaseDisplay::BaseDisplay: ¥Ç¥£¥¹¥×¥ì¥¤Àܳ¤Ë¼Â¹Ô»þ¥¯¥í¡¼¥º¥Õ¥é¥°¤ò¤¿¤Æ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n
 $ #BadWindowRemove
 # BaseDisplay::eventLoop(): ¥¤¥Ù¥ó¥È¥­¥å¡¼¤«¤éÉÔÀµ¤Ê¥¦¥£¥ó¥É¥¦¤ò¾Ã¤·¤Þ¤¹\n

diff --git a/nls/ja_JP/Configmenu.m b/nls/ja_JP/Configmenu.m
index 80297194fb09760936890044bbff81793cfa8930..38a40e5d6fc5be419213b3415cff7d6848afb42e 100644 (file)
--- a/nls/ja_JP/Configmenu.m
+++ b/nls/ja_JP/Configmenu.m
@@ -9,19 +9,21 @@ $ #WindowPlacement
 $ #ImageDithering
 # ²èÁü¥Ç¥£¥¶
 $ #OpaqueMove
-# ¥¦¥£¥ó¥É¥¦ÉÔÆ©ÌÀ°ÜÆ°
+# ÉÔÆ©ÌÀ¤Ë¤·¤Æ¥¦¥£¥ó¥É¥¦¤ò°ÜÆ°
 $ #FullMax
 # ´°Á´ºÇÂç²½
 $ #FocusNew
 # ¿·µ¬¥¦¥£¥ó¥É¥¦¤Ë¥Õ¥©¡¼¥«¥¹
 $ #FocusLast
-# ¥ï¡¼¥¯¥¹¥Ú¡¼¥¹Êѹ¹»þ¤Ë¥¦¥£¥ó¥É¥¦¤Ë¥Õ¥©¡¼¥«¥¹
+# ¥ï¡¼¥¯¥¹¥Ú¡¼¥¹°ÜÆ°»þ¤Ë¥¦¥£¥ó¥É¥¦¤Ë¥Õ¥©¡¼¥«¥¹
 $ #ClickToFocus
-# Click to Focus
+# ¥¯¥ê¥Ã¥¯¤Ç¥Õ¥©¡¼¥«¥¹
 $ #SloppyFocus
 # Sloppy Focus
 $ #AutoRaise
-# ¼«Æ°Åª¤ËÁ°Ì̤˽Ф¹
+# ¼«Æ°Åª¤ËÁ°Ì̤Ë
+$ #ClickRaise
+# ¥¯¥ê¥Ã¥¯¤ÇÁ°Ì̤Ë
 $ #SmartRows
 # ¸­¤¯ÇÛÃÖ (¹Ô)
 $ #SmartCols

diff --git a/nls/ja_JP/Screen.m b/nls/ja_JP/Screen.m
index 098857d40d1352cbfb9a8692a98dacf15b056919..1f16fa2b8503491faadb7fad0654677669a5e46a 100644 (file)
--- a/nls/ja_JP/Screen.m
+++ b/nls/ja_JP/Screen.m
@@ -2,13 +2,13 @@ $set 6 #Screen
 
 $ #AnotherWMRunning
 # BScreen::BScreen: X ¥µ¡¼¥ÐÌä¹ç¤»Ãæ¤Ë¥¨¥é¡¼È¯À¸\n  \
-another window manager is already running on display %s.\n
+¾¤Î¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤¬¥Ç¥£¥¹¥×¥ì¥¤ %s ¤Ç´û¤Ë¼Â¹ÔÃæ¤Ç¤¹.\n
 $ #ManagingScreen
-# BScreen::BScreen: ¥¹¥¯¥ê¡¼¥ó %d ¤ò»ë³Ð¸ú²Ì 0x%lx, ¿¼¤µ %d ¤ÇÀ©¸æ\n
+# BScreen::BScreen: ¥¹¥¯¥ê¡¼¥ó %d ¤ò»ë³Ð¸ú²Ì 0x%lx, ¿¼ÅÙ %d ¤ÇÀ©¸æÃæ\n
 $ #FontLoadFail
 # BScreen::LoadStyle(): ¥Õ¥©¥ó¥È '%s' ¤òÆɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿\n
 $ #DefaultFontLoadFail
-# BScreen::LoadStyle(): ¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤òÆɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿\n
+# BScreen::LoadStyle(): ɸ½à¥Õ¥©¥ó¥È¤òÆɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿\n
 $ #EmptyMenuFile
 # %s: ¶õ¤Î¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ë\n
 $ #xterm
@@ -18,17 +18,17 @@ $ #Restart
 $ #Exit
 # ½ªÎ»
 $ #EXECError
-# BScreen::parseMenuFile: [exec] ¥¨¥é¡¼¡¢¥á¥Ë¥å¡¼¥é¥Ù¥ë¤È(¤¢¤ë¤¤¤Ï)¥³¥Þ¥ó¥É̤ÄêµÁ\n
+# BScreen::parseMenuFile: [exec] ¥¨¥é¡¼¡¢¥á¥Ë¥å¡¼¥é¥Ù¥ë(¥³¥Þ¥ó¥É)̤ÄêµÁ\n
 $ #EXITError
 # BScreen::parseMenuFile: [exit] ¥¨¥é¡¼¡¢¥á¥Ë¥å¡¼¥é¥Ù¥ë̤ÄêµÁ\n
 $ #STYLEError
-# BScreen::parseMenuFile: [style] ¥¨¥é¡¼¡¢¥á¥Ë¥å¡¼¥é¥Ù¥ë¤È(¤¢¤ë¤¤¤Ï)¥Õ¥¡¥¤¥ë̤̾ÄêµÁ\n
+# BScreen::parseMenuFile: [style] ¥¨¥é¡¼¡¢¥á¥Ë¥å¡¼¥é¥Ù¥ë(¥Õ¥¡¥¤¥ë̾)̤ÄêµÁ\n
 $ #CONFIGError
 # BScreen::parseMenuFile: [config] ¥¨¥é¡¼¡¢¥á¥Ë¥å¡¼¥é¥Ù¥ë̤ÄêµÁ\n
 $ #INCLUDEError
 # BScreen::parseMenuFile: [include] ¥¨¥é¡¼¡¢¥Õ¥¡¥¤¥ë̤̾ÄêµÁ\n
 $ #INCLUDEErrorReg
-# BScreen::parseMenuFile: [include] ¥¨¥é¡¼¡¢'%s' ¤Ï¥ì¥®¥å¥é¡¼¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n
+# BScreen::parseMenuFile: [include] ¥¨¥é¡¼¡¢'%s' ¤ÏÀµµ¬¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n
 $ #SUBMENUError
 # BScreen::parseMenuFile: [submenu] ¥¨¥é¡¼¡¢¥á¥Ë¥å¡¼¥é¥Ù¥ë̤ÄêµÁ\n
 $ #RESTARTError

diff --git a/nls/ja_JP/Slit.m b/nls/ja_JP/Slit.m
index 8e3d65ab315f5368f1896e7ee236ea7eac14e1f2..91bf0fb59154e05b8ad0cd99497b905ae380e52a 100644 (file)
--- a/nls/ja_JP/Slit.m
+++ b/nls/ja_JP/Slit.m
@@ -1,8 +1,8 @@
 $set 7 #Slit
 
 $ #SlitTitle
-# Slit
+# ¥¹¥ê¥Ã¥È
 $ #SlitDirection
-# Slit ¤ÎÊý¸þ
+# ¥¹¥ê¥Ã¥È¤ÎÊý¸þ
 $ #SlitPlacement
-# Slit ¤ÎÇÛÃÖ
+# ¥¹¥ê¥Ã¥È¤ÎÇÛÃÖ

diff --git a/nls/ja_JP/Toolbar.m b/nls/ja_JP/Toolbar.m
index 14c3bb3b000ab720d5642dc5703a6cfb23af13e8..74b27e9dc35325af28a9c027450297364ecf226c 100644 (file)
--- a/nls/ja_JP/Toolbar.m
+++ b/nls/ja_JP/Toolbar.m
@@ -17,6 +17,6 @@ $ #NoStrftimeTimeFormatA
 $ #ToolbarTitle
 # ¥Ä¡¼¥ë¥Ð¡¼
 $ #EditWkspcName
-# º£¤Î¥ï¡¼¥¯¥¹¥Ú¡¼¥¹Ì¾¤òÊÔ½¸
+# ¸½¥ï¡¼¥¯¥¹¥Ú¡¼¥¹Ì¾¤òÊÔ½¸
 $ #ToolbarPlacement
-# ¥Ä¡¼¥ë¥Ð¡¼¤Î°ÌÃÖ
+# ¥Ä¡¼¥ë¥Ð¡¼¤ÎÇÛÃÖ

diff --git a/nls/ja_JP/Windowmenu.m b/nls/ja_JP/Windowmenu.m
index deebbb13bbc86df8383726a96969660ec1871fd9..1c71cd3b07a151aede0cc24a4c7df1a20ade9797 100644 (file)
--- a/nls/ja_JP/Windowmenu.m
+++ b/nls/ja_JP/Windowmenu.m
@@ -1,7 +1,7 @@
 $set 10 #Windowmenu
 
 $ #SendTo
-# Á÷¤êÀè ...
+# Á÷¤êÀè...
 $ #Shade
 # ¥·¥§¡¼¥É
 $ #Iconify
@@ -9,9 +9,9 @@ $ #Iconify
 $ #Maximize
 # ºÇÂç²½
 $ #Raise
-# Á°Ì̤˽Ф¹
+# Á°Ì̤Ë
 $ #Lower
-# ÇØÌ̤˲¼¤²¤ë
+# ¸åÌ̤Ë
 $ #Stick
 # µïºÂ¤ê
 $ #KillClient

diff --git a/nls/ja_JP/Workspacemenu.m b/nls/ja_JP/Workspacemenu.m
index 244dca2bb1b7793756aa8955df758825c6ca7e29..ed7cfcc1ee870d37b3fa0b675da4e803026f3385 100644 (file)
--- a/nls/ja_JP/Workspacemenu.m
+++ b/nls/ja_JP/Workspacemenu.m
@@ -5,4 +5,4 @@ $ #WorkspacesTitle
 $ #NewWorkspace
 # ¿·µ¬¥ï¡¼¥¯¥¹¥Ú¡¼¥¹
 $ #RemoveLast
-# ËöÈø¤Î¥ï¡¼¥¯¥¹¥Ú¡¼¥¹¤ò¾Ã¤¹
+# ËöÈø¥ï¡¼¥¯¥¹¥Ú¡¼¥¹¾Ãµî

diff --git a/nls/ja_JP/blackbox.m b/nls/ja_JP/blackbox.m
index 9cf81d514d50ae2a01c13125375dc5b05ee6a1a7..25017ccb2a053885df0b223eb679bc4064cf0ba6 100644 (file)
--- a/nls/ja_JP/blackbox.m
+++ b/nls/ja_JP/blackbox.m
@@ -1,6 +1,6 @@
 $set 13 #blackbox
 
 $ #NoManagableScreens
-# Blackbox::Blackbox: Áàºî²Äǽ¤Ê¥¹¥¯¥ê¡¼¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡¢Ãæ»ß¤·¤Þ¤¹\n
+# Blackbox::Blackbox: Áàºî²Äǽ¤Ê¥¹¥¯¥ê¡¼¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡¢¼Â¹ÔÃæ»ß\n
 $ #MapRequest
 # Blackbox::process_event: MapRequest (0x%lx ¤ËÂФ·¤Æ)\n

diff --git a/nls/ja_JP/bsetroot.m b/nls/ja_JP/bsetroot.m
index a0cb8ea1694baadea2360d83d688a24466aa7758..b7d78dd7ce2c1952d8193eb7aadb8f18cda1bd8f 100644 (file)
--- a/nls/ja_JP/bsetroot.m
+++ b/nls/ja_JP/bsetroot.m
@@ -4,13 +4,13 @@ $ #MustSpecify
 # %s: ¥¨¥é¡¼: ¼¡¤ÎÃ椫¤é°ì¤Ä¤òÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: -solid, -mod, -gradient\n
 $ #Usage
 # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\
-  -display <string>        »ØÄê¥Ç¥£¥¹¥×¥ì¥¤¤ËÀܳ\n\
-  -mod <x> <y>             ¥â¥¸¥å¡¼¥é¥Ñ¥¿¡¼¥ó\n\
-  -foreground, -fg <color> ¥â¥¸¥å¡¼¥éÁ°·Ê¿§\n\
-  -background, -bg <color> ¥â¥¸¥å¡¼¥éÇØ·Ê¿§\n\n\
-  -gradient <texture>      ¥°¥é¥Ç¥£¥¨¥ó¥È¥Æ¥¯¥¹¥Á¥ã\n\
-  -from <color>            ¥°¥é¥Ç¥£¥¨¥ó¥È³«»Ï¿§\n\
-  -to <color>              ¥°¥é¥Ç¥£¥¨¥ó¥È½ªÃ¼¿§\n\n\
+  -display <string>        ¥Ç¥£¥¹¥×¥ì¥¤¤ò»ØÄê\n\
+  -mod <x> <y>             ÁȤ߹ç¤ï¤»¥Ñ¥¿¡¼¥ó\n\
+  -foreground, -fg <color> ÁȤ߹ç¤ï¤»Á°·Ê¿§\n\
+  -background, -bg <color> ÁȤ߹ç¤ï¤»ÇØ·Ê¿§\n\n\
+  -gradient <texture>      ¥°¥é¥Ç¡¼¥·¥ç¥ó¥Æ¥¯¥¹¥Á¥ã\n\
+  -from <color>            ¥°¥é¥Ç¡¼¥·¥ç¥óºÇ½é¤Î¿§\n\
+  -to <color>              ¥°¥é¥Ç¡¼¥·¥ç¥ó½ª¤ê¤Î¿§\n\
   -solid <color>           ñ¿§\n\n\
   -help                    ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¡¢½ªÎ»\n
 

diff --git a/nls/ja_JP/main.m b/nls/ja_JP/main.m
index 9911c32e26b67cae17bcf2599516d892d6637f31..8a815a77ecd67218e6cb69eea097cbed64d76eba 100644 (file)
--- a/nls/ja_JP/main.m
+++ b/nls/ja_JP/main.m
@@ -19,8 +19,8 @@ $ #Usage
   -help\t\t\t\t¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¡¢½ªÎ»\n\n
 $ #CompileOptions
 # ¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó:\n\
-  Debugging\t\t\t%s\n\
+  ¥Ç¥Ð¥Ã¥°\t\t\t%s\n\
   Shape:\t\t\t%s\n\
   Xft:\t\t\t\t%s\n\
   Xinerama:\t\t\t%s\n\
-  8bpp Ordered Dithering:\t%s\n\n
+  8bpp ¥Ç¥£¥¶:\t%s\n\n