Revision: 6677
Author: ek.kato
Date: Wed Aug  4 19:02:13 2010
Log: * Merge r6673:6676 from trunk.

http://code.google.com/p/uim/source/detail?r=6677

Modified:
 /branches/1.6
 /branches/1.6/RELNOTE
 /branches/1.6/po
 /branches/1.6/po/fr.po
 /branches/1.6/po/ja.po
 /branches/1.6/po/ko.po
 /branches/1.6/scm/sj3-custom.scm
 /branches/1.6/scm/wnn-custom.scm

=======================================
--- /branches/1.6/RELNOTE       Fri Jul 30 01:28:07 2010
+++ /branches/1.6/RELNOTE       Wed Aug  4 19:02:13 2010
@@ -1,5 +1,5 @@
 uim 1.6.0-beta Release Note
-======================
+===========================

 About This Release
 ------------------
@@ -58,8 +58,8 @@
     '--with-libgcroots=installed' to configure options for uim to disable
     build and install of the bundled version of libgcroots

-  - libuim, and libuim-custom ABI are updated, and some libuim-scm API
-    are added.
+  - libuim, and libuim-custom ABI are updated, and some of libuim-scm
+    API are added.


 Roadmap
=======================================
--- /branches/1.6/po/fr.po      Mon Aug  2 23:52:38 2010
+++ /branches/1.6/po/fr.po      Wed Aug  4 19:02:13 2010
@@ -4497,7 +4497,7 @@
 msgstr ""

 #: ../scm/sj3-custom.scm:321
-msgid "Use value of use remote SJ3 server"
+msgid "Use remote SJ3 server"
 msgstr ""

 #: ../scm/sj3-custom.scm:328
@@ -5676,7 +5676,7 @@
 msgstr ""

 #: ../scm/wnn-custom.scm:321
-msgid "Use value of use remote Wnn server"
+msgid "Use remote Wnn server"
 msgstr ""

 #: ../scm/wnn-custom.scm:328
=======================================
--- /branches/1.6/po/ja.po      Mon Aug  2 23:52:38 2010
+++ /branches/1.6/po/ja.po      Wed Aug  4 19:02:13 2010
@@ -4628,7 +4628,7 @@
 msgstr "SJ3 (高度)"

 #: ../scm/sj3-custom.scm:321
-msgid "Use value of use remote SJ3 server"
+msgid "Use remote SJ3 server"
 msgstr "ローカルマシン以外のSJ3サーバに接続する"

 #: ../scm/sj3-custom.scm:328
@@ -5812,7 +5812,7 @@
 msgstr "Wnn (高度)"

 #: ../scm/wnn-custom.scm:321
-msgid "Use value of use remote Wnn server"
+msgid "Use remote Wnn server"
 msgstr "ローカルマシン以外のWnnサーバに接続する"

 #: ../scm/wnn-custom.scm:328
=======================================
--- /branches/1.6/po/ko.po      Mon Aug  2 23:52:38 2010
+++ /branches/1.6/po/ko.po      Wed Aug  4 19:02:13 2010
@@ -4508,7 +4508,7 @@
 msgstr ""

 #: ../scm/sj3-custom.scm:321
-msgid "Use value of use remote SJ3 server"
+msgid "Use remote SJ3 server"
 msgstr ""

 #: ../scm/sj3-custom.scm:328
@@ -5687,7 +5687,7 @@
 msgstr ""

 #: ../scm/wnn-custom.scm:321
-msgid "Use value of use remote Wnn server"
+msgid "Use remote Wnn server"
 msgstr ""

 #: ../scm/wnn-custom.scm:328
=======================================
--- /branches/1.6/scm/sj3-custom.scm    Tue Jul 20 01:20:45 2010
+++ /branches/1.6/scm/sj3-custom.scm    Wed Aug  4 19:02:13 2010
@@ -318,7 +318,7 @@
 (define-custom 'sj3-use-remote-server? #f
   '(sj3-advanced sj3server)
   '(boolean)
-  (N_ "Use value of use remote SJ3 server")
+  (N_ "Use remote SJ3 server")
   (N_ "long description will be here."))


=======================================
--- /branches/1.6/scm/wnn-custom.scm    Tue Jul 20 01:20:45 2010
+++ /branches/1.6/scm/wnn-custom.scm    Wed Aug  4 19:02:13 2010
@@ -318,7 +318,7 @@
 (define-custom 'wnn-use-remote-server? #f
   '(wnn-advanced wnnserver)
   '(boolean)
-  (N_ "Use value of use remote Wnn server")
+  (N_ "Use remote Wnn server")
   (N_ "long description will be here."))


Reply via email to