[uim-commit] r2608 - in branches/1.0: . po scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-15 23:44:46 -0800 (Thu, 15 Dec 2005)
New Revision: 2608

Modified:
   branches/1.0/NEWS
   branches/1.0/po/fr.po
   branches/1.0/po/ja.po
   branches/1.0/po/ko.po
   branches/1.0/po/uim.pot
   branches/1.0/scm/canna-custom.scm
   branches/1.0/scm/canna.scm
Log:
* NEWS
* po/fr.po
* po/ja.po
* po/ko.po
* po/uim.pot
* scm/canna.scm
* scm/canna-custom.scm
  - Port r2605-2607 from trunk.


Modified: branches/1.0/NEWS
===================================================================
--- branches/1.0/NEWS	2005-12-16 07:38:06 UTC (rev 2607)
+++ branches/1.0/NEWS	2005-12-16 07:44:46 UTC (rev 2608)
@@ -22,6 +22,9 @@
     - uim-pref-qt
       - code cleanup (Kazuki)
 
+    - Canna
+      - fix behavior of backspace key in conversion state (Etsushi)
+
   o Others
     - Update translations
 

Modified: branches/1.0/po/fr.po
===================================================================
--- branches/1.0/po/fr.po	2005-12-16 07:38:06 UTC (rev 2607)
+++ branches/1.0/po/fr.po	2005-12-16 07:44:46 UTC (rev 2608)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-16 14:33+0900\n"
+"POT-Creation-Date: 2005-12-16 16:23+0900\n"
 "PO-Revision-Date: 2005-02-21 15:52+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud at mandrakesoft.com>\n"
 "Language-Team: fr <LL at li.org>\n"
@@ -1297,7 +1297,7 @@
 msgstr ""
 
 #: scm/canna-custom.lisp:304
-msgid "Use Canna server"
+msgid "Specify Canna server"
 msgstr ""
 
 #: scm/canna-custom.lisp:310

Modified: branches/1.0/po/ja.po
===================================================================
--- branches/1.0/po/ja.po	2005-12-16 07:38:06 UTC (rev 2607)
+++ branches/1.0/po/ja.po	2005-12-16 07:44:46 UTC (rev 2608)
@@ -97,7 +97,7 @@
 msgstr ""
 "Project-Id-Version: uim 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-16 14:33+0900\n"
+"POT-Creation-Date: 2005-12-16 16:23+0900\n"
 "PO-Revision-Date: 2005-12-09 16:17+0900\n"
 "Last-Translator: Daichi Kawahata <daichik at users.sourceforge.net>\n"
 "Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
@@ -1413,8 +1413,8 @@
 msgstr "Canna サーバ"
 
 #: scm/canna-custom.lisp:304
-msgid "Use Canna server"
-msgstr "Cannaサーバを使用する"
+msgid "Specify Canna server"
+msgstr "Cannaサーバを指定する"
 
 #: scm/canna-custom.lisp:310
 msgid "Canna server name"

Modified: branches/1.0/po/ko.po
===================================================================
--- branches/1.0/po/ko.po	2005-12-16 07:38:06 UTC (rev 2607)
+++ branches/1.0/po/ko.po	2005-12-16 07:44:46 UTC (rev 2608)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: uim 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-16 14:33+0900\n"
+"POT-Creation-Date: 2005-12-16 16:23+0900\n"
 "PO-Revision-Date: 2005-12-07 22:31+0900\n"
 "Last-Translator: Jae-hyeon Park <jhyeon at gmail.com>\n"
 "Language-Team: Korean <LL at li.org>\n"
@@ -1309,7 +1309,7 @@
 msgstr ""
 
 #: scm/canna-custom.lisp:304
-msgid "Use Canna server"
+msgid "Specify Canna server"
 msgstr ""
 
 #: scm/canna-custom.lisp:310

Modified: branches/1.0/po/uim.pot
===================================================================
--- branches/1.0/po/uim.pot	2005-12-16 07:38:06 UTC (rev 2607)
+++ branches/1.0/po/uim.pot	2005-12-16 07:44:46 UTC (rev 2608)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-16 14:33+0900\n"
+"POT-Creation-Date: 2005-12-16 16:23+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1298,7 +1298,7 @@
 msgstr ""
 
 #: scm/canna-custom.lisp:304
-msgid "Use Canna server"
+msgid "Specify Canna server"
 msgstr ""
 
 #: scm/canna-custom.lisp:310

Modified: branches/1.0/scm/canna-custom.scm
===================================================================
--- branches/1.0/scm/canna-custom.scm	2005-12-16 07:38:06 UTC (rev 2607)
+++ branches/1.0/scm/canna-custom.scm	2005-12-16 07:44:46 UTC (rev 2608)
@@ -301,7 +301,7 @@
 (define-custom 'custom-activate-canna-server-name? #f
   '(cannaserver)
   '(boolean)
-  (_ "Use Canna server")
+  (_ "Specify Canna server")
   (_ "long description will be here."))
 
 (define-custom 'custom-preserved-canna-server-name ""

Modified: branches/1.0/scm/canna.scm
===================================================================
--- branches/1.0/scm/canna.scm	2005-12-16 07:38:06 UTC (rev 2607)
+++ branches/1.0/scm/canna.scm	2005-12-16 07:44:46 UTC (rev 2608)
@@ -819,7 +819,8 @@
      ((canna-backspace-key? key key-state)
       (begin
 	(canna-context-set-state! cc #f)
-	(canna-reset-candidate-window cc)))
+	(canna-reset-candidate-window cc)
+	(canna-lib-reset-conversion cc-id)))
 
      ((canna-next-candidate-key? key key-state)
       (canna-move-candidate cc 1))