diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 4ac3dccbc..1639debda 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,6 +8,9 @@ http://www.newbreedsoftware.com/tuxpaint/
 
 
 2004.March.21 (0.9.14) [cvs]
+  * Japanese translation updates.
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
+
   * Dutch translation updates.
     Geert Stams <geertstams@wanadoo.nl>
 
@@ -212,7 +215,7 @@ http://www.newbreedsoftware.com/tuxpaint/
     and you went to the 'Open' dialog.
   
   * Fixed prompt bug for larger window sizes
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
 
 2003.Jun.17 (0.9.11)
@@ -240,7 +243,7 @@ http://www.newbreedsoftware.com/tuxpaint/
     Mantas Kriauciunas <monte@mail.lt>
 
   * Set $OUTPUT_CHARSET for Japanese locale, to fix Win32 issue.
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
   * Lithuanian translation.
     Mantas Kriauciunas <monte@mail.lt>,
@@ -338,7 +341,7 @@ http://www.newbreedsoftware.com/tuxpaint/
     Karl Ove Hufthammer <karl@huftis.org>
 
   * Added Japanese translation to Tux Paint icon (tuxpaint.desktop)
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
   * Moved Makefile.beos into src/, to keep root directory less cluttered.
 
@@ -359,7 +362,7 @@ http://www.newbreedsoftware.com/tuxpaint/
   * Removed some debugging output that shouldn't have been kept in.
 
   * Locale-detection code made more robust.  (Check LC_MESSAGES, not LC_ALL)
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
   * Added support for some useful HTML escape sequences in stamp descriptions
     (e.g., "&acute;" for "แ" ("a" with "'" over it))
@@ -395,7 +398,7 @@ http://www.newbreedsoftware.com/tuxpaint/
     selector on the right.
 
   * Fixed Japanese locale detection.
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
   * Stamp description translations can be encoded using UTF-8.
     Append ".utf8" to the locale code (e.g., "fr.utf8=...")
@@ -407,7 +410,7 @@ http://www.newbreedsoftware.com/tuxpaint/
 
 2003.January.26 (0.9.7)
   * Translated to Japanese!
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
   * Fixed translation bugs with some save-related prompts.
 
@@ -431,10 +434,10 @@ http://www.newbreedsoftware.com/tuxpaint/
     if it doesn't exist
 
   * Initial support for arbitrary window sizes.  (#define SVGA for 800x600)
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
   * Added a few new colors, renamed some old ones.
-    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+    TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
 
   * Fixed text tool bug when hitting [Enter]/[Return] past bottom of canvas
 
diff --git a/src/messages/ja.po b/src/messages/ja.po
index f44986193..68abdfcc3 100644
--- a/src/messages/ja.po
+++ b/src/messages/ja.po
@@ -1,19 +1,19 @@
 # Tuxpaint japanese translation.
 # tuxpaint ใฎ ๆ—ฅๆœฌ่ชž่จณ
-# Copyright (C) 2003
+# Copyright (C) 2004
 # This file is distributed under the same license as the Tuxpaint package.
 # ใ“ใฎใƒ•ใ‚กใ‚คใƒซใฏ Tuxpaint ใฎใƒ‘ใƒƒใ‚ฑใƒผใ‚ธใจๅŒใ˜ไฝฟ็”จ่จฑ่ซพใซๅŸบใฅใ„ใฆ้…ๅธƒใ•ใ‚Œใพใ™ใ€‚
-# TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>, 2003.
+# TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>, 2004.
 #
 # Nota per futures traduccions/actualitzacions:
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Tuxpaint 0.9.5\n"
+"Project-Id-Version: Tuxpaint 0.9.14\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2003-01-27 14:36-0800\n"
-"Last-Translator: TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>\n"
-"Language-Team: TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>\n"
+"PO-Revision-Date: 2004-03-21 22:00+0900\n"
+"Last-Translator: TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>\n"
+"Language-Team: TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,19 +46,17 @@ msgstr "ใใฎใˆใฏใฒใ‚‰ใ‘ใพใ›ใ‚“ใงใ—ใŸ๏ผ"
 
 #: tuxpaint.c:808 tuxpaint.c:815 tuxpaint.c:822 tuxpaint.c:825
 msgid "OK"
-msgstr ""
+msgstr "ใ‚ชใƒƒใ‚ฑใƒผ"
 
 #: tuxpaint.c:810
 msgid "Starting a new picture will erase the current one!"
 msgstr "ใ•ใ„ใ—ใ‚‡ใ‹ใ‚‰ใ‚„ใ‚ŠใชใŠใ™ใจใ€ใ„ใพใฎใˆใŒใใˆใ‚‹ใ‚ˆ๏ผ"
 
 #: tuxpaint.c:811
-#, fuzzy
 msgid "That's OK!"
-msgstr "ใ„ใ„ใ‚ˆ"
+msgstr "ใ„ใ„ใ‚ˆ๏ผ"
 
 #: tuxpaint.c:812
-#, fuzzy
 msgid "Never mind!"
 msgstr "ใ‚„ใ‚ใŸ๏ผ"
 
@@ -67,9 +65,8 @@ msgid "There are no saved files!"
 msgstr "ใ‚ปใƒผใƒ–ใ•ใ‚ŒใŸ ใˆใฏ ใ‚ใ‚Šใพใ›ใ‚“๏ผ"
 
 #: tuxpaint.c:817
-#, fuzzy
 msgid "Print your picture now?"
-msgstr "ใใฎใพใˆใซ ใ„ใพใฎใˆใ‚’ ใ‚ปใƒผใƒ–ใ™ใ‚‹๏ผŸ"
+msgstr "ใ„ใ‚“ใ•ใคใ—ใพใ™ใ‹๏ผŸ"
 
 #: tuxpaint.c:821
 msgid "Your picture has been printed!"
@@ -96,7 +93,6 @@ msgid "Back"
 msgstr "ใ‚‚ใฉใ‚‹"
 
 #: tuxpaint.c:9064
-#, fuzzy
 msgid "Save over the older version of this picture?"
 msgstr "ใพใˆใฎ ใˆใ‚’ ใ†ใ‚ใŒใใ—ใพใ™ใ‹๏ผŸ"
 
@@ -105,84 +101,68 @@ msgid "No, save a new file"
 msgstr "ใ„ใ„ใˆใ€ในใคใฎใƒ•ใ‚กใ‚คใƒซใซ ใ‚ปใƒผใƒ–ใ—ใพใ™"
 
 #: tuxpaint.c:9885
-#, fuzzy
 msgid "Choose the picture you want, then click 'Open'."
 msgstr "ใˆใ‚’ใˆใ‚‰ใ‚“ใงใ‹ใ‚‰ ใ€Œใฒใ‚‰ใใ€ใ‚’ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆใญ"
 
 #: colors.h:62
-#, fuzzy
 msgid "Black!"
-msgstr "ใใ‚"
+msgstr "ใใ‚๏ผ"
 
 #: colors.h:63
-#, fuzzy
 msgid "White!"
-msgstr "ใ—ใ‚"
+msgstr "ใ—ใ‚๏ผ"
 
 #: colors.h:64
-#, fuzzy
 msgid "Red!"
-msgstr "ใ‚„ใฃใฑใ‚Š ใ‚„ใ‚ŠใชใŠใ—๏ผ"
+msgstr "ใ‚ใ‹๏ผ"
 
 #: colors.h:65
-#, fuzzy
 msgid "Pink!"
-msgstr "ใƒ”ใƒณใ‚ฏ"
+msgstr "ใƒ”ใƒณใ‚ฏ๏ผ"
 
 #: colors.h:66
-#, fuzzy
 msgid "Orange!"
-msgstr "ใ‚ชใƒฌใƒณใ‚ธ"
+msgstr "ใ‚ชใƒฌใƒณใ‚ธ๏ผ"
 
 #: colors.h:67
-#, fuzzy
 msgid "Yellow!"
-msgstr "ใใ„ใ‚"
+msgstr "ใใ„ใ‚๏ผ"
 
 #: colors.h:68
-#, fuzzy
 msgid "Lime!"
-msgstr "ใƒฉใ‚คใƒ "
+msgstr "ใƒฉใ‚คใƒ ๏ผ"
 
 #: colors.h:69
-#, fuzzy
 msgid "Green!"
-msgstr "ใฟใฉใ‚Š"
+msgstr "ใฟใฉใ‚Š๏ผ"
 
 #: colors.h:70
-#, fuzzy
 msgid "Cyan!"
-msgstr "ใฟใšใ„ใ‚"
+msgstr "ใฟใšใ„ใ‚๏ผ"
 
 #: colors.h:71
-#, fuzzy
 msgid "Blue!"
-msgstr "ใ‚ใŠ"
+msgstr "ใ‚ใŠ๏ผ"
 
 #: colors.h:72
-#, fuzzy
 msgid "Purple!"
-msgstr "ใ‚€ใ‚‰ใ•ใ"
+msgstr "ใ‚€ใ‚‰ใ•ใ๏ผ"
 
 #: colors.h:73
-#, fuzzy
 msgid "Fuchsia!"
-msgstr "ใƒ›ใ‚ฏใ‚ทใƒฃ"
+msgstr "ใƒ›ใ‚ฏใ‚ทใƒฃ๏ผ"
 
 #: colors.h:74
-#, fuzzy
 msgid "Brown!"
-msgstr "ใกใ‚ƒใ„ใ‚"
+msgstr "ใกใ‚ƒใ„ใ‚๏ผ"
 
 #: colors.h:75
-#, fuzzy
 msgid "Gray!"
-msgstr "ใ™ใ”ใ„๏ผ"
+msgstr "ใฏใ„ใ„ใ‚๏ผ"
 
 #: colors.h:76
-#, fuzzy
 msgid "Silver!"
-msgstr "ใŽใ‚“ใ„ใ‚"
+msgstr "ใŽใ‚“ใ„ใ‚๏ผ"
 
 #: great.h:20
 msgid "Great!"
@@ -257,32 +237,26 @@ msgid "You can draw in rainbow colors!"
 msgstr "ใซใ˜ใ„ใ‚ใง ใ‹ใ“ใ†๏ผ"
 
 #: magic.h:74
-#, fuzzy
 msgid "Click and move to draw sparkles."
 msgstr "ใฒใฐใชใ‚’ ใ‹ใ“ใ†"
 
 #: magic.h:76
-#, fuzzy
 msgid "Click to make a mirror image."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ™ใ‚‹ใจ ใ•ใ‚†ใ†ใซใฒใฃใใ‚Šใ‹ใˆใ‚‹ใ‚ˆ๏ผ"
 
 #: magic.h:77
-#, fuzzy
 msgid "Click to flip the picture upside-down."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ™ใ‚‹ใจ ใˆใŒ ใ•ใ‹ใ•ใพใซใชใ‚‹ใ‚ˆ๏ผ"
 
 #: magic.h:79
-#, fuzzy
 msgid "Click and move the mouse around to blur the picture."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพ ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ—ใฆ ใˆใ‚’ ใผใ‹ใ—ใพใ—ใ‚‡ใ†"
 
 #: magic.h:80
-#, fuzzy
 msgid "Click and move the mouse around to make the picture blocky."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพ ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ™ใจ ใใ“ใŒใƒขใ‚ถใ‚คใ‚ฏใซใชใ‚‹ใ‚ˆ"
 
 #: magic.h:82
-#, fuzzy
 msgid "Click and move the mouse around to draw a negative."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพ ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ—ใฆ ใƒใ‚ฌใƒใ‚ธใซใ—ใ‚ˆใ†"
 
@@ -291,27 +265,22 @@ msgid "Click and move to fade the colors."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพ ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ™ใจ ใ„ใ‚ใŒ ใ†ใ™ใใชใ‚‹ใ‚ˆ."
 
 #: magic.h:85
-msgid ""
-"Click and move the mouse around to turn the picture into a chalk drawing."
+msgid "Click and move the mouse around to turn the picture into a chalk drawing."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ™ใจ ใƒใƒงใƒผใ‚ฏใงใ‹ใ„ใŸใฟใŸใ„ใซ ใชใ‚‹ใ‚ˆ"
 
 #: magic.h:86
-#, fuzzy
 msgid "Click and move the mouse around to make the picture drip."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพ ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ™ใจ ใฌใ‚‰ใ—ใŸใ‚ˆใ†ใซ ใชใ‚‹ใ‚ˆ๏ผ"
 
 #: magic.h:88
-#, fuzzy
 msgid "Click and move the mouse to thicken the picture."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพ ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ™ใจ ใใ“ใŒ ใตใจใใชใ‚‹ใ‚ˆ๏ผ"
 
 #: magic.h:89
-#, fuzzy
 msgid "Click and move the mouse to thin the picture."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใพใพ ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ™ใจ ใใ“ใŒ ใปใใใชใ‚‹ใ‚ˆ๏ผ"
 
 #: magic.h:91
-#, fuzzy
 msgid "Click in the picture to fill that area with color."
 msgstr "ใฌใ‚Šใคใถใ—ใŸใ„ใจใ“ใ‚ใ‚’ ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆใญ"
 
@@ -448,21 +417,14 @@ msgid "Pick a picture to stamp around your drawing."
 msgstr "ใฏใ‚“ใ“ใ‚’ใˆใ‚‰ใผใ†"
 
 #: tools.h:64
-#, fuzzy
 msgid "Click to start drawing a line. Let go to complete it."
 msgstr "ใ‚ฏใƒชใƒƒใ‚ฏใ—ใฆ ใ›ใ‚“ใ‚’ ใฒใ“ใ†"
 
 #: tools.h:65
-#, fuzzy
-msgid ""
-"Pick a shape. Click to pick the center, drag, then let go when it is the "
-"size you want. Move around to rotate it, and click to draw it."
-msgstr ""
-"ใšใ‘ใ„ใ‚’ใˆใ‚‰ใ‚“ใงใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใ‚‰ใ€ใƒ‰ใƒฉใƒƒใ‚ฐใ—ใฆ ใ™ใใชใŠใŠใใ•ใซใ—ใ‚ˆใ†ใ€‚ใพใ‚ใ—"
-"ใฆใ€ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใ‚‰ ใงใใ‚ใŒใ‚Š"
+msgid "Pick a shape. Click to pick the center, drag, then let go when it is the size you want. Move around to rotate it, and click to draw it."
+msgstr "ใšใ‘ใ„ใ‚’ใˆใ‚‰ใ‚“ใงใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใ‚‰ใ€ใƒ‰ใƒฉใƒƒใ‚ฐใ—ใฆ ใ™ใใชใŠใŠใใ•ใซใ—ใ‚ˆใ†ใ€‚ใพใ‚ใ—ใฆใ€ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใ‚‰ ใงใใ‚ใŒใ‚Š"
 
 #: tools.h:66
-#, fuzzy
 msgid "Choose a style of text. Click on your drawing and you can start typing."
 msgstr "ใ˜ใฎใ‹ใŸใกใ‚’ใˆใ‚‰ใ‚“ใงใ€ใ‚ฏใƒชใƒƒใ‚ฏใ—ใŸใ‚ใจ ใ‚ญใƒผใ‚’ใŠใ—ใฆ ใ˜ใ‚’ใ‹ใ“ใ†"
 
@@ -517,12 +479,3 @@ msgstr "ใƒžใ‚ฆใ‚นใ‚’ใ†ใ”ใ‹ใ—ใฆ ใšใ‘ใ„ใ‚’ใพใ‚ใใ†ใ€‚ใ‚ฏใƒชใƒƒใ‚ฏใ—
 #: tools.h:81
 msgid "Ok then... Let's keep drawing this one!"
 msgstr "ใ‚ชใƒƒใ‚ฑใƒผใ€‚ ใ˜ใ‚ƒใ‚ ใ“ใฎใพใพใคใฅใ‘ใ‚ˆใ†๏ผ"
-
-#~ msgid "Okay"
-#~ msgstr "ใŠใฃใ‘ใƒผ"
-
-#~ msgid "Red"
-#~ msgstr "ใ‚ใ‹"
-
-#~ msgid "Grey"
-#~ msgstr "ใฏใ„ใ„ใ‚"