[uim-commit] r871 - in trunk: po scm

ekato at freedesktop.org ekato at freedesktop.org
Tue Jun 7 02:30:08 PDT 2005


Author: ekato
Date: 2005-06-07 02:30:03 -0700 (Tue, 07 Jun 2005)
New Revision: 871

Modified:
   trunk/po/fr.po
   trunk/po/ja.po
   trunk/po/uim.pot
   trunk/scm/skk-custom.scm
Log:
* scm/skk-custom.scm : Set skk-candidate-op-count and
  skk-nr-candidate-max depending on skk-candidate-selection-style
  and ssk-use-manual-candwin-setting?.
(skk-use-manucal-candwin-setting?) : New custom variable.  This
  activates setting of skk-candidate-op-count and
  skk-nr-candidate-max.  This variable is only used in custom.
(skk-use-candidate-window?) : Set additional activity hooks to
  rest of candidate window settings.

* po/uim.pot : Update.
* po/ja.po : Ditto.
* po/fr.po : Ditto.


Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2005-06-06 19:43:54 UTC (rev 870)
+++ trunk/po/fr.po	2005-06-07 09:30:03 UTC (rev 871)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 12:25+0900\n"
+"POT-Creation-Date: 2005-06-07 18:18+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"
@@ -645,20 +645,21 @@
 #: scm/im-custom.lisp:314 scm/im-custom.lisp:320 scm/im-custom.lisp:326
 #: scm/im-custom.lisp:332 scm/im-custom.lisp:338 scm/im-custom.lisp:344
 #: scm/im-custom.lisp:351 scm/im-custom.lisp:357 scm/im-custom.lisp:364
+#: scm/im-custom.lisp:370 scm/im-custom.lisp:376 scm/im-custom.lisp:382
 #: scm/prime-custom.lisp:58 scm/prime-custom.lisp:64 scm/prime-custom.lisp:70
 #: scm/prime-custom.lisp:76 scm/prime-custom.lisp:82 scm/prime-custom.lisp:90
 #: scm/prime-custom.lisp:96 scm/prime-custom.lisp:102
 #: scm/prime-custom.lisp:145 scm/prime-custom.lisp:154
 #: scm/prime-key-custom.lisp:61 scm/prime-key-custom.lisp:65
 #: scm/prime-key-custom.lisp:69 scm/skk-custom.lisp:59 scm/skk-custom.lisp:65
-#: scm/skk-custom.lisp:71 scm/skk-custom.lisp:77 scm/skk-custom.lisp:85
-#: scm/skk-custom.lisp:163 scm/skk-custom.lisp:182 scm/skk-custom.lisp:191
-#: scm/skk-custom.lisp:222 scm/skk-custom.lisp:231 scm/skk-custom.lisp:274
-#: scm/skk-custom.lisp:280 scm/skk-custom.lisp:292 scm/skk-custom.lisp:299
-#: scm/skk-custom.lisp:306 scm/skk-custom.lisp:318 scm/skk-custom.lisp:324
-#: scm/skk-custom.lisp:330 scm/skk-custom.lisp:336 scm/skk-custom.lisp:346
-#: scm/skk-custom.lisp:352 scm/skk-custom.lisp:373 scm/skk-custom.lisp:379
-#: scm/skk-custom.lisp:386 scm/skk-key-custom.lisp:65
+#: scm/skk-custom.lisp:73 scm/skk-custom.lisp:79 scm/skk-custom.lisp:85
+#: scm/skk-custom.lisp:91 scm/skk-custom.lisp:218 scm/skk-custom.lisp:237
+#: scm/skk-custom.lisp:246 scm/skk-custom.lisp:277 scm/skk-custom.lisp:286
+#: scm/skk-custom.lisp:329 scm/skk-custom.lisp:335 scm/skk-custom.lisp:347
+#: scm/skk-custom.lisp:354 scm/skk-custom.lisp:361 scm/skk-custom.lisp:373
+#: scm/skk-custom.lisp:379 scm/skk-custom.lisp:385 scm/skk-custom.lisp:391
+#: scm/skk-custom.lisp:401 scm/skk-custom.lisp:407 scm/skk-custom.lisp:428
+#: scm/skk-custom.lisp:434 scm/skk-custom.lisp:441 scm/skk-key-custom.lisp:65
 #: scm/skk-key-custom.lisp:69 scm/skk-key-custom.lisp:73
 #: scm/skk-key-custom.lisp:78 scm/spellcheck-custom.lisp:48
 #: scm/spellcheck-custom.lisp:54 scm/spellcheck-custom.lisp:60
@@ -678,13 +679,13 @@
 msgstr ""
 
 #: scm/anthy-custom.lisp:77 scm/canna-custom.lisp:81
-#: scm/generic-custom.lisp:48 scm/skk-custom.lisp:64
+#: scm/generic-custom.lisp:48 scm/skk-custom.lisp:84
 #: scm/spellcheck-custom.lisp:53
 msgid "Conversion key press count to show candidate window"
 msgstr ""
 
 #: scm/anthy-custom.lisp:83 scm/canna-custom.lisp:87
-#: scm/generic-custom.lisp:54 scm/prime-custom.lisp:57 scm/skk-custom.lisp:70
+#: scm/generic-custom.lisp:54 scm/prime-custom.lisp:57 scm/skk-custom.lisp:90
 msgid "Number of candidates in candidate window at a time"
 msgstr ""
 
@@ -693,53 +694,53 @@
 msgstr ""
 
 #: scm/anthy-custom.lisp:119 scm/canna-custom.lisp:113
-#: scm/prime-custom.lisp:122 scm/skk-custom.lisp:114
+#: scm/prime-custom.lisp:122 scm/skk-custom.lisp:169
 msgid "Direct input"
 msgstr ""
 
-#: scm/anthy-custom.lisp:120 scm/canna-custom.lisp:114 scm/skk-custom.lisp:115
+#: scm/anthy-custom.lisp:120 scm/canna-custom.lisp:114 scm/skk-custom.lisp:170
 msgid "Direct input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:124 scm/canna-custom.lisp:118 scm/skk-custom.lisp:119
+#: scm/anthy-custom.lisp:124 scm/canna-custom.lisp:118 scm/skk-custom.lisp:174
 msgid "Hiragana"
 msgstr ""
 
-#: scm/anthy-custom.lisp:125 scm/canna-custom.lisp:119 scm/skk-custom.lisp:120
+#: scm/anthy-custom.lisp:125 scm/canna-custom.lisp:119 scm/skk-custom.lisp:175
 msgid "Hiragana input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:129 scm/canna-custom.lisp:123 scm/skk-custom.lisp:124
+#: scm/anthy-custom.lisp:129 scm/canna-custom.lisp:123 scm/skk-custom.lisp:179
 msgid "Katakana"
 msgstr ""
 
-#: scm/anthy-custom.lisp:130 scm/canna-custom.lisp:124 scm/skk-custom.lisp:125
+#: scm/anthy-custom.lisp:130 scm/canna-custom.lisp:124 scm/skk-custom.lisp:180
 msgid "Katakana input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:134 scm/canna-custom.lisp:128 scm/skk-custom.lisp:129
+#: scm/anthy-custom.lisp:134 scm/canna-custom.lisp:128 scm/skk-custom.lisp:184
 msgid "Halfwidth Katakana"
 msgstr ""
 
-#: scm/anthy-custom.lisp:135 scm/canna-custom.lisp:129 scm/skk-custom.lisp:130
+#: scm/anthy-custom.lisp:135 scm/canna-custom.lisp:129 scm/skk-custom.lisp:185
 msgid "Halfwidth Katakana input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:139 scm/canna-custom.lisp:133
-#: scm/prime-custom.lisp:132 scm/skk-custom.lisp:134
+#: scm/prime-custom.lisp:132 scm/skk-custom.lisp:189
 msgid "Fullwidth Alphanumeric"
 msgstr ""
 
 #: scm/anthy-custom.lisp:140 scm/canna-custom.lisp:134
-#: scm/prime-custom.lisp:133 scm/skk-custom.lisp:135
+#: scm/prime-custom.lisp:133 scm/skk-custom.lisp:190
 msgid "Fullwidth Alphanumeric input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:147 scm/canna-custom.lisp:141 scm/skk-custom.lisp:142
+#: scm/anthy-custom.lisp:147 scm/canna-custom.lisp:141 scm/skk-custom.lisp:197
 msgid "Romaji"
 msgstr ""
 
-#: scm/anthy-custom.lisp:148 scm/canna-custom.lisp:142 scm/skk-custom.lisp:143
+#: scm/anthy-custom.lisp:148 scm/canna-custom.lisp:142 scm/skk-custom.lisp:198
 msgid "Romaji input mode"
 msgstr ""
 
@@ -751,45 +752,45 @@
 msgid "Kana input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:157 scm/canna-custom.lisp:151 scm/skk-custom.lisp:147
+#: scm/anthy-custom.lisp:157 scm/canna-custom.lisp:151 scm/skk-custom.lisp:202
 msgid "AZIK"
 msgstr ""
 
-#: scm/anthy-custom.lisp:158 scm/canna-custom.lisp:152 scm/skk-custom.lisp:148
+#: scm/anthy-custom.lisp:158 scm/canna-custom.lisp:152 scm/skk-custom.lisp:203
 msgid "AZIK extended romaji input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:167 scm/anthy-custom.lisp:168
-#: scm/canna-custom.lisp:161 scm/canna-custom.lisp:162 scm/skk-custom.lisp:157
-#: scm/skk-custom.lisp:158
+#: scm/canna-custom.lisp:161 scm/canna-custom.lisp:162 scm/skk-custom.lisp:212
+#: scm/skk-custom.lisp:213
 msgid "Input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:170 scm/anthy-custom.lisp:171
-#: scm/canna-custom.lisp:164 scm/canna-custom.lisp:165 scm/skk-custom.lisp:160
-#: scm/skk-custom.lisp:161
+#: scm/canna-custom.lisp:164 scm/canna-custom.lisp:165 scm/skk-custom.lisp:215
+#: scm/skk-custom.lisp:216
 msgid "Kana input method"
 msgstr "Méthode d'entrée Kana"
 
-#: scm/anthy-custom.lisp:172 scm/canna-custom.lisp:166 scm/skk-custom.lisp:162
+#: scm/anthy-custom.lisp:172 scm/canna-custom.lisp:166 scm/skk-custom.lisp:217
 msgid "Enabled toolbar buttons"
 msgstr ""
 
 #: scm/anthy-custom.lisp:191 scm/canna-custom.lisp:185
-#: scm/prime-custom.lisp:144 scm/skk-custom.lisp:181
+#: scm/prime-custom.lisp:144 scm/skk-custom.lisp:236
 msgid "Default input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:200 scm/canna-custom.lisp:194
-#: scm/prime-custom.lisp:153 scm/skk-custom.lisp:190
+#: scm/prime-custom.lisp:153 scm/skk-custom.lisp:245
 msgid "Input mode menu items"
 msgstr ""
 
-#: scm/anthy-custom.lisp:242 scm/canna-custom.lisp:236 scm/skk-custom.lisp:221
+#: scm/anthy-custom.lisp:242 scm/canna-custom.lisp:236 scm/skk-custom.lisp:276
 msgid "Default kana input method"
 msgstr "Méthode d'entrée Kana par défaut"
 
-#: scm/anthy-custom.lisp:251 scm/canna-custom.lisp:245 scm/skk-custom.lisp:230
+#: scm/anthy-custom.lisp:251 scm/canna-custom.lisp:245 scm/skk-custom.lisp:285
 msgid "Kana input method menu items"
 msgstr "Entrées de menu de la méthode d'entrée Kana"
 
@@ -1288,11 +1289,11 @@
 msgid "Enabled input methods"
 msgstr "Méthodes d'entrée activées"
 
-#: scm/im-custom.lisp:276 scm/skk-custom.lisp:82 scm/skk-custom.lisp:316
+#: scm/im-custom.lisp:276 scm/skk-custom.lisp:70 scm/skk-custom.lisp:371
 msgid "uim"
 msgstr "uim"
 
-#: scm/im-custom.lisp:276 scm/skk-custom.lisp:82 scm/skk-custom.lisp:316
+#: scm/im-custom.lisp:276 scm/skk-custom.lisp:70 scm/skk-custom.lisp:371
 msgid "uim native"
 msgstr "uim natif"
 
@@ -1368,6 +1369,18 @@
 msgid "The directory which contains EB dictionary file"
 msgstr ""
 
+#: scm/im-custom.lisp:369
+msgid "XIM settings"
+msgstr ""
+
+#: scm/im-custom.lisp:375
+msgid "Use anti-aliased fonts for Over-the-Spot/Root-Window preedit"
+msgstr ""
+
+#: scm/im-custom.lisp:381
+msgid "Font name for preedit area (anti-aliased)"
+msgstr ""
+
 #: scm/ipa-x-sampa.lisp:227 scm/ipa-x-sampa.lisp:228
 msgid "International Phonetic Alphabet (X-SAMPA)"
 msgstr ""
@@ -1582,79 +1595,83 @@
 msgid "Advanced settings for SKK"
 msgstr "Paramètres avancés pour SKK"
 
-#: scm/skk-custom.lisp:76
+#: scm/skk-custom.lisp:64
 msgid "Commit candidate by heading label keys"
 msgstr ""
 
-#: scm/skk-custom.lisp:83
+#: scm/skk-custom.lisp:71
 msgid "ddskk-like"
 msgstr ""
 
-#: scm/skk-custom.lisp:83 scm/skk-custom.lisp:315
+#: scm/skk-custom.lisp:71 scm/skk-custom.lisp:370
 msgid "Similar to ddskk"
 msgstr "Semblable à ddskk"
 
-#: scm/skk-custom.lisp:84
+#: scm/skk-custom.lisp:72
 msgid "Candidate selection style"
 msgstr ""
 
-#: scm/skk-custom.lisp:273
+#: scm/skk-custom.lisp:78
+msgid "Set candidate window behavior manually"
+msgstr ""
+
+#: scm/skk-custom.lisp:328
 msgid "Use skkserv instead of SKK-JISYO"
 msgstr ""
 
-#: scm/skk-custom.lisp:279
+#: scm/skk-custom.lisp:334
 msgid "Port number of skkserv"
 msgstr ""
 
-#: scm/skk-custom.lisp:291
+#: scm/skk-custom.lisp:346
 msgid "Dictionary file"
 msgstr "Fichier dictionnaire"
 
-#: scm/skk-custom.lisp:298
+#: scm/skk-custom.lisp:353
 msgid "Personal dictionary file"
 msgstr "Fichier du dictionnaire personnel"
 
-#: scm/skk-custom.lisp:305
+#: scm/skk-custom.lisp:360
 msgid "Personal dictionary file (dedicated to uim)"
 msgstr ""
 
-#: scm/skk-custom.lisp:315
+#: scm/skk-custom.lisp:370
 msgid "ddskk"
 msgstr "ddskk"
 
-#: scm/skk-custom.lisp:317
+#: scm/skk-custom.lisp:372
 msgid "Visual style"
 msgstr "Style visuel"
 
-#: scm/skk-custom.lisp:323
+#: scm/skk-custom.lisp:378
 msgid "Use recursive learning"
 msgstr ""
 
-#: scm/skk-custom.lisp:329
+#: scm/skk-custom.lisp:384
 msgid "Use numeric conversion"
 msgstr ""
 
-#: scm/skk-custom.lisp:335
+#: scm/skk-custom.lisp:390
 msgid "Enable auto conversion with punctuation marks"
 msgstr ""
 
-#: scm/skk-custom.lisp:345
+#: scm/skk-custom.lisp:400
 msgid "Show annotation of candidate word"
 msgstr ""
 
-#: scm/skk-custom.lisp:351
+#: scm/skk-custom.lisp:406
 msgid "Show annotation also in preedit area"
 msgstr ""
 
-#: scm/skk-custom.lisp:372
+#: scm/skk-custom.lisp:427
 msgid "Friendly for vi user"
 msgstr ""
 
-#: scm/skk-custom.lisp:378
+#: scm/skk-custom.lisp:433
 msgid "Use Enter key as just committing (egg-like operation)"
 msgstr ""
 
-#: scm/skk-custom.lisp:385
+#: scm/skk-custom.lisp:440
 msgid "Commit newline as ASCII string instead of native key-event"
 msgstr ""
 

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2005-06-06 19:43:54 UTC (rev 870)
+++ trunk/po/ja.po	2005-06-07 09:30:03 UTC (rev 871)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: uim 0.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 12:25+0900\n"
+"POT-Creation-Date: 2005-06-07 18:18+0900\n"
 "PO-Revision-Date: 2005-02-24 19:28+0900\n"
 "Last-Translator: YamaKen <yamaken at bp.iij4u.or.jp>\n"
 "Language-Team: Japanese <LL at li.org>\n"
@@ -660,20 +660,21 @@
 #: scm/im-custom.lisp:314 scm/im-custom.lisp:320 scm/im-custom.lisp:326
 #: scm/im-custom.lisp:332 scm/im-custom.lisp:338 scm/im-custom.lisp:344
 #: scm/im-custom.lisp:351 scm/im-custom.lisp:357 scm/im-custom.lisp:364
+#: scm/im-custom.lisp:370 scm/im-custom.lisp:376 scm/im-custom.lisp:382
 #: scm/prime-custom.lisp:58 scm/prime-custom.lisp:64 scm/prime-custom.lisp:70
 #: scm/prime-custom.lisp:76 scm/prime-custom.lisp:82 scm/prime-custom.lisp:90
 #: scm/prime-custom.lisp:96 scm/prime-custom.lisp:102
 #: scm/prime-custom.lisp:145 scm/prime-custom.lisp:154
 #: scm/prime-key-custom.lisp:61 scm/prime-key-custom.lisp:65
 #: scm/prime-key-custom.lisp:69 scm/skk-custom.lisp:59 scm/skk-custom.lisp:65
-#: scm/skk-custom.lisp:71 scm/skk-custom.lisp:77 scm/skk-custom.lisp:85
-#: scm/skk-custom.lisp:163 scm/skk-custom.lisp:182 scm/skk-custom.lisp:191
-#: scm/skk-custom.lisp:222 scm/skk-custom.lisp:231 scm/skk-custom.lisp:274
-#: scm/skk-custom.lisp:280 scm/skk-custom.lisp:292 scm/skk-custom.lisp:299
-#: scm/skk-custom.lisp:306 scm/skk-custom.lisp:318 scm/skk-custom.lisp:324
-#: scm/skk-custom.lisp:330 scm/skk-custom.lisp:336 scm/skk-custom.lisp:346
-#: scm/skk-custom.lisp:352 scm/skk-custom.lisp:373 scm/skk-custom.lisp:379
-#: scm/skk-custom.lisp:386 scm/skk-key-custom.lisp:65
+#: scm/skk-custom.lisp:73 scm/skk-custom.lisp:79 scm/skk-custom.lisp:85
+#: scm/skk-custom.lisp:91 scm/skk-custom.lisp:218 scm/skk-custom.lisp:237
+#: scm/skk-custom.lisp:246 scm/skk-custom.lisp:277 scm/skk-custom.lisp:286
+#: scm/skk-custom.lisp:329 scm/skk-custom.lisp:335 scm/skk-custom.lisp:347
+#: scm/skk-custom.lisp:354 scm/skk-custom.lisp:361 scm/skk-custom.lisp:373
+#: scm/skk-custom.lisp:379 scm/skk-custom.lisp:385 scm/skk-custom.lisp:391
+#: scm/skk-custom.lisp:401 scm/skk-custom.lisp:407 scm/skk-custom.lisp:428
+#: scm/skk-custom.lisp:434 scm/skk-custom.lisp:441 scm/skk-key-custom.lisp:65
 #: scm/skk-key-custom.lisp:69 scm/skk-key-custom.lisp:73
 #: scm/skk-key-custom.lisp:78 scm/spellcheck-custom.lisp:48
 #: scm/spellcheck-custom.lisp:54 scm/spellcheck-custom.lisp:60
@@ -693,13 +694,13 @@
 msgstr "¸õÊ䥦¥£¥ó¥É¥¦¤ò»ÈÍѤ¹¤ë"
 
 #: scm/anthy-custom.lisp:77 scm/canna-custom.lisp:81
-#: scm/generic-custom.lisp:48 scm/skk-custom.lisp:64
+#: scm/generic-custom.lisp:48 scm/skk-custom.lisp:84
 #: scm/spellcheck-custom.lisp:53
 msgid "Conversion key press count to show candidate window"
 msgstr "¸õÊ䥦¥£¥ó¥É¥¦¤Îɽ¼¨¤ò³«»Ï¤¹¤ë¤Þ¤Ç¤ÎÊÑ´¹¥­¡¼²¡²¼¿ô"
 
 #: scm/anthy-custom.lisp:83 scm/canna-custom.lisp:87
-#: scm/generic-custom.lisp:54 scm/prime-custom.lisp:57 scm/skk-custom.lisp:70
+#: scm/generic-custom.lisp:54 scm/prime-custom.lisp:57 scm/skk-custom.lisp:90
 msgid "Number of candidates in candidate window at a time"
 msgstr "¸õÊ䥦¥£¥ó¥É¥¦¤Ëɽ¼¨¤¹¤ë¸õÊä¿ô"
 
@@ -708,53 +709,53 @@
 msgstr "¿ô»ú¥­¡¼¤Ç¸õÊä¤òÁªÂò¤¹¤ë"
 
 #: scm/anthy-custom.lisp:119 scm/canna-custom.lisp:113
-#: scm/prime-custom.lisp:122 scm/skk-custom.lisp:114
+#: scm/prime-custom.lisp:122 scm/skk-custom.lisp:169
 msgid "Direct input"
 msgstr "ľÀÜÆþÎÏ"
 
-#: scm/anthy-custom.lisp:120 scm/canna-custom.lisp:114 scm/skk-custom.lisp:115
+#: scm/anthy-custom.lisp:120 scm/canna-custom.lisp:114 scm/skk-custom.lisp:170
 msgid "Direct input mode"
 msgstr "ľÀÜÆþÎϥ⡼¥É"
 
-#: scm/anthy-custom.lisp:124 scm/canna-custom.lisp:118 scm/skk-custom.lisp:119
+#: scm/anthy-custom.lisp:124 scm/canna-custom.lisp:118 scm/skk-custom.lisp:174
 msgid "Hiragana"
 msgstr "¤Ò¤é¤¬¤Ê"
 
-#: scm/anthy-custom.lisp:125 scm/canna-custom.lisp:119 scm/skk-custom.lisp:120
+#: scm/anthy-custom.lisp:125 scm/canna-custom.lisp:119 scm/skk-custom.lisp:175
 msgid "Hiragana input mode"
 msgstr "¤Ò¤é¤¬¤ÊÆþÎϥ⡼¥É"
 
-#: scm/anthy-custom.lisp:129 scm/canna-custom.lisp:123 scm/skk-custom.lisp:124
+#: scm/anthy-custom.lisp:129 scm/canna-custom.lisp:123 scm/skk-custom.lisp:179
 msgid "Katakana"
 msgstr "¥«¥¿¥«¥Ê"
 
-#: scm/anthy-custom.lisp:130 scm/canna-custom.lisp:124 scm/skk-custom.lisp:125
+#: scm/anthy-custom.lisp:130 scm/canna-custom.lisp:124 scm/skk-custom.lisp:180
 msgid "Katakana input mode"
 msgstr "¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"
 
-#: scm/anthy-custom.lisp:134 scm/canna-custom.lisp:128 scm/skk-custom.lisp:129
+#: scm/anthy-custom.lisp:134 scm/canna-custom.lisp:128 scm/skk-custom.lisp:184
 msgid "Halfwidth Katakana"
 msgstr "Ⱦ³Ñ¥«¥¿¥«¥Ê"
 
-#: scm/anthy-custom.lisp:135 scm/canna-custom.lisp:129 scm/skk-custom.lisp:130
+#: scm/anthy-custom.lisp:135 scm/canna-custom.lisp:129 scm/skk-custom.lisp:185
 msgid "Halfwidth Katakana input mode"
 msgstr "Ⱦ³Ñ¥«¥¿¥«¥ÊÆþÎϥ⡼¥É"
 
 #: scm/anthy-custom.lisp:139 scm/canna-custom.lisp:133
-#: scm/prime-custom.lisp:132 scm/skk-custom.lisp:134
+#: scm/prime-custom.lisp:132 scm/skk-custom.lisp:189
 msgid "Fullwidth Alphanumeric"
 msgstr "Á´³Ñ±Ñ¿ô"
 
 #: scm/anthy-custom.lisp:140 scm/canna-custom.lisp:134
-#: scm/prime-custom.lisp:133 scm/skk-custom.lisp:135
+#: scm/prime-custom.lisp:133 scm/skk-custom.lisp:190
 msgid "Fullwidth Alphanumeric input mode"
 msgstr "Á´³Ñ±Ñ¿ôÆþÎϥ⡼¥É"
 
-#: scm/anthy-custom.lisp:147 scm/canna-custom.lisp:141 scm/skk-custom.lisp:142
+#: scm/anthy-custom.lisp:147 scm/canna-custom.lisp:141 scm/skk-custom.lisp:197
 msgid "Romaji"
 msgstr "¥í¡¼¥Þ»ú"
 
-#: scm/anthy-custom.lisp:148 scm/canna-custom.lisp:142 scm/skk-custom.lisp:143
+#: scm/anthy-custom.lisp:148 scm/canna-custom.lisp:142 scm/skk-custom.lisp:198
 msgid "Romaji input mode"
 msgstr "¥í¡¼¥Þ»úÆþÎϥ⡼¥É"
 
@@ -766,45 +767,45 @@
 msgid "Kana input mode"
 msgstr "¤«¤ÊÆþÎϥ⡼¥É"
 
-#: scm/anthy-custom.lisp:157 scm/canna-custom.lisp:151 scm/skk-custom.lisp:147
+#: scm/anthy-custom.lisp:157 scm/canna-custom.lisp:151 scm/skk-custom.lisp:202
 msgid "AZIK"
 msgstr "AZIK"
 
-#: scm/anthy-custom.lisp:158 scm/canna-custom.lisp:152 scm/skk-custom.lisp:148
+#: scm/anthy-custom.lisp:158 scm/canna-custom.lisp:152 scm/skk-custom.lisp:203
 msgid "AZIK extended romaji input mode"
 msgstr "AZIK³ÈÄ¥¥í¡¼¥Þ»úÆþÎϥ⡼¥É"
 
 #: scm/anthy-custom.lisp:167 scm/anthy-custom.lisp:168
-#: scm/canna-custom.lisp:161 scm/canna-custom.lisp:162 scm/skk-custom.lisp:157
-#: scm/skk-custom.lisp:158
+#: scm/canna-custom.lisp:161 scm/canna-custom.lisp:162 scm/skk-custom.lisp:212
+#: scm/skk-custom.lisp:213
 msgid "Input mode"
 msgstr "ÆþÎϥ⡼¥É"
 
 #: scm/anthy-custom.lisp:170 scm/anthy-custom.lisp:171
-#: scm/canna-custom.lisp:164 scm/canna-custom.lisp:165 scm/skk-custom.lisp:160
-#: scm/skk-custom.lisp:161
+#: scm/canna-custom.lisp:164 scm/canna-custom.lisp:165 scm/skk-custom.lisp:215
+#: scm/skk-custom.lisp:216
 msgid "Kana input method"
 msgstr "¤«¤ÊÆþÎÏÊý¼°"
 
-#: scm/anthy-custom.lisp:172 scm/canna-custom.lisp:166 scm/skk-custom.lisp:162
+#: scm/anthy-custom.lisp:172 scm/canna-custom.lisp:166 scm/skk-custom.lisp:217
 msgid "Enabled toolbar buttons"
 msgstr "¥Ä¡¼¥ë¥Ð¡¼¾å¤Ëɽ¼¨¤¹¤ë¥Ü¥¿¥ó"
 
 #: scm/anthy-custom.lisp:191 scm/canna-custom.lisp:185
-#: scm/prime-custom.lisp:144 scm/skk-custom.lisp:181
+#: scm/prime-custom.lisp:144 scm/skk-custom.lisp:236
 msgid "Default input mode"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤ÎÆþÎϥ⡼¥É"
 
 #: scm/anthy-custom.lisp:200 scm/canna-custom.lisp:194
-#: scm/prime-custom.lisp:153 scm/skk-custom.lisp:190
+#: scm/prime-custom.lisp:153 scm/skk-custom.lisp:245
 msgid "Input mode menu items"
 msgstr "ÆþÎϥ⡼¥É¥á¥Ë¥å¡¼¹àÌÜ"
 
-#: scm/anthy-custom.lisp:242 scm/canna-custom.lisp:236 scm/skk-custom.lisp:221
+#: scm/anthy-custom.lisp:242 scm/canna-custom.lisp:236 scm/skk-custom.lisp:276
 msgid "Default kana input method"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¤«¤ÊÆþÎÏÊý¼°"
 
-#: scm/anthy-custom.lisp:251 scm/canna-custom.lisp:245 scm/skk-custom.lisp:230
+#: scm/anthy-custom.lisp:251 scm/canna-custom.lisp:245 scm/skk-custom.lisp:285
 msgid "Kana input method menu items"
 msgstr "¤«¤ÊÆþÎÏÊý¼°¥á¥Ë¥å¡¼¹àÌÜ"
 
@@ -1304,11 +1305,11 @@
 msgid "Enabled input methods"
 msgstr "»ÈÍѲÄǽ¤Ë¤¹¤ëÆþÎÏÊý¼°"
 
-#: scm/im-custom.lisp:276 scm/skk-custom.lisp:82 scm/skk-custom.lisp:316
+#: scm/im-custom.lisp:276 scm/skk-custom.lisp:70 scm/skk-custom.lisp:371
 msgid "uim"
 msgstr "uim"
 
-#: scm/im-custom.lisp:276 scm/skk-custom.lisp:82 scm/skk-custom.lisp:316
+#: scm/im-custom.lisp:276 scm/skk-custom.lisp:70 scm/skk-custom.lisp:371
 msgid "uim native"
 msgstr "uim¥Í¥¤¥Æ¥£¥Ö"
 
@@ -1384,6 +1385,18 @@
 msgid "The directory which contains EB dictionary file"
 msgstr "EB¼­½ñ¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤·¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê"
 
+#: scm/im-custom.lisp:369
+msgid "XIM settings"
+msgstr "XIMÀßÄê"
+
+#: scm/im-custom.lisp:375
+msgid "Use anti-aliased fonts for Over-the-Spot/Root-Window preedit"
+msgstr "XIMÆȼ«¤ÎÊÔ½¸Îΰè¤Ë¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹¥Õ¥©¥ó¥È¤ò»ÈÍÑ"
+
+#: scm/im-custom.lisp:381
+msgid "Font name for preedit area (anti-aliased)"
+msgstr "ÊÔ½¸Îΰè¤Ë»ÈÍѤ¹¤ë¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹¥Õ¥©¥ó¥È"
+
 #: scm/ipa-x-sampa.lisp:227 scm/ipa-x-sampa.lisp:228
 msgid "International Phonetic Alphabet (X-SAMPA)"
 msgstr "IPA (¹ñºÝȯÀ¼µ­¹æ X-SAMPAÈÇ)"
@@ -1598,79 +1611,83 @@
 msgid "Advanced settings for SKK"
 msgstr "SKK¸þ¤±¤Î¾åµéÀßÄê"
 
-#: scm/skk-custom.lisp:76
+#: scm/skk-custom.lisp:64
 msgid "Commit candidate by heading label keys"
 msgstr "¸«½Ð¤·É½¼¨¤Î¥­¡¼¤Ç¸õÊä¤òÁªÂò¤¹¤ë"
 
-#: scm/skk-custom.lisp:83
+#: scm/skk-custom.lisp:71
 msgid "ddskk-like"
 msgstr "ddskk-like"
 
-#: scm/skk-custom.lisp:83 scm/skk-custom.lisp:315
+#: scm/skk-custom.lisp:71 scm/skk-custom.lisp:370
 msgid "Similar to ddskk"
 msgstr "ddskkÉ÷"
 
-#: scm/skk-custom.lisp:84
+#: scm/skk-custom.lisp:72
 msgid "Candidate selection style"
 msgstr "¸õÊäÁªÂò¤Î¥¹¥¿¥¤¥ë"
 
-#: scm/skk-custom.lisp:273
+#: scm/skk-custom.lisp:78
+msgid "Set candidate window behavior manually"
+msgstr "¸õÊ䥦¥£¥ó¥É¥¦¤ÎµóÆ°¤ò¼êÆ°¤ÇÀßÄꤹ¤ë"
+
+#: scm/skk-custom.lisp:328
 msgid "Use skkserv instead of SKK-JISYO"
 msgstr "¼­½ñ¥Õ¥¡¥¤¥ë¤ÎÂå¤ï¤ê¤ËSKK¥µ¡¼¥Ð¤ò»ÈÍÑ"
 
-#: scm/skk-custom.lisp:279
+#: scm/skk-custom.lisp:334
 msgid "Port number of skkserv"
 msgstr "SKK¥µ¡¼¥Ð¤Î¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: scm/skk-custom.lisp:291
+#: scm/skk-custom.lisp:346
 msgid "Dictionary file"
 msgstr "¼­½ñ¥Õ¥¡¥¤¥ë"
 
-#: scm/skk-custom.lisp:298
+#: scm/skk-custom.lisp:353
 msgid "Personal dictionary file"
 msgstr "¸Ä¿Í¼­½ñ¥Õ¥¡¥¤¥ë"
 
-#: scm/skk-custom.lisp:305
+#: scm/skk-custom.lisp:360
 msgid "Personal dictionary file (dedicated to uim)"
 msgstr "¸Ä¿Í¼­½ñ¥Õ¥¡¥¤¥ë (uimÀìÍÑ)"
 
-#: scm/skk-custom.lisp:315
+#: scm/skk-custom.lisp:370
 msgid "ddskk"
 msgstr "ddskk"
 
-#: scm/skk-custom.lisp:317
+#: scm/skk-custom.lisp:372
 msgid "Visual style"
 msgstr "¥Ó¥¸¥å¥¢¥ë¥¹¥¿¥¤¥ë"
 
-#: scm/skk-custom.lisp:323
+#: scm/skk-custom.lisp:378
 msgid "Use recursive learning"
 msgstr "ºÆµ¢³Ø½¬¤ò»ÈÍѤ¹¤ë"
 
-#: scm/skk-custom.lisp:329
+#: scm/skk-custom.lisp:384
 msgid "Use numeric conversion"
 msgstr "¿ôÃÍÊÑ´¹¤ò»ÈÍѤ¹¤ë"
 
-#: scm/skk-custom.lisp:335
+#: scm/skk-custom.lisp:390
 msgid "Enable auto conversion with punctuation marks"
 msgstr "¶çÆÉÅÀ¤Ë¤è¤ë¼«Æ°ÊÑ´¹¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: scm/skk-custom.lisp:345
+#: scm/skk-custom.lisp:400
 msgid "Show annotation of candidate word"
 msgstr "¸õÊä¤ËÃð¼á¤òɽ¼¨¤¹¤ë"
 
-#: scm/skk-custom.lisp:351
+#: scm/skk-custom.lisp:406
 msgid "Show annotation also in preedit area"
 msgstr "ÊÔ½¸ÎΰèÆâ¤Ë¤âÃð¼á¤òɽ¼¨¤¹¤ë"
 
-#: scm/skk-custom.lisp:372
+#: scm/skk-custom.lisp:427
 msgid "Friendly for vi user"
 msgstr "vi¤ËŬ±þ¤·¤¿ÆþÎÏÀ©¸æ¤ò»ÈÍѤ¹¤ë"
 
-#: scm/skk-custom.lisp:378
+#: scm/skk-custom.lisp:433
 msgid "Use Enter key as just committing (egg-like operation)"
 msgstr "Enter¥­¡¼¤òñ¤Ë³ÎÄê¤Î¤¿¤á¤Ë»È¤¦ (eggÉ÷¤ÎÁàºî)"
 
-#: scm/skk-custom.lisp:385
+#: scm/skk-custom.lisp:440
 msgid "Commit newline as ASCII string instead of native key-event"
 msgstr "¿·µ¬¹Ô¤ò¥Í¥¤¥Æ¥£¥Ö¥­¡¼¥¤¥Ù¥ó¥È¤ÎÂå¤ï¤ê¤ËASCIIʸ»úÎó¤È¤·¤Æ³ÎÄꤹ¤ë"
 

Modified: trunk/po/uim.pot
===================================================================
--- trunk/po/uim.pot	2005-06-06 19:43:54 UTC (rev 870)
+++ trunk/po/uim.pot	2005-06-07 09:30:03 UTC (rev 871)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-31 12:25+0900\n"
+"POT-Creation-Date: 2005-06-07 18:18+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"
@@ -641,20 +641,21 @@
 #: scm/im-custom.lisp:314 scm/im-custom.lisp:320 scm/im-custom.lisp:326
 #: scm/im-custom.lisp:332 scm/im-custom.lisp:338 scm/im-custom.lisp:344
 #: scm/im-custom.lisp:351 scm/im-custom.lisp:357 scm/im-custom.lisp:364
+#: scm/im-custom.lisp:370 scm/im-custom.lisp:376 scm/im-custom.lisp:382
 #: scm/prime-custom.lisp:58 scm/prime-custom.lisp:64 scm/prime-custom.lisp:70
 #: scm/prime-custom.lisp:76 scm/prime-custom.lisp:82 scm/prime-custom.lisp:90
 #: scm/prime-custom.lisp:96 scm/prime-custom.lisp:102
 #: scm/prime-custom.lisp:145 scm/prime-custom.lisp:154
 #: scm/prime-key-custom.lisp:61 scm/prime-key-custom.lisp:65
 #: scm/prime-key-custom.lisp:69 scm/skk-custom.lisp:59 scm/skk-custom.lisp:65
-#: scm/skk-custom.lisp:71 scm/skk-custom.lisp:77 scm/skk-custom.lisp:85
-#: scm/skk-custom.lisp:163 scm/skk-custom.lisp:182 scm/skk-custom.lisp:191
-#: scm/skk-custom.lisp:222 scm/skk-custom.lisp:231 scm/skk-custom.lisp:274
-#: scm/skk-custom.lisp:280 scm/skk-custom.lisp:292 scm/skk-custom.lisp:299
-#: scm/skk-custom.lisp:306 scm/skk-custom.lisp:318 scm/skk-custom.lisp:324
-#: scm/skk-custom.lisp:330 scm/skk-custom.lisp:336 scm/skk-custom.lisp:346
-#: scm/skk-custom.lisp:352 scm/skk-custom.lisp:373 scm/skk-custom.lisp:379
-#: scm/skk-custom.lisp:386 scm/skk-key-custom.lisp:65
+#: scm/skk-custom.lisp:73 scm/skk-custom.lisp:79 scm/skk-custom.lisp:85
+#: scm/skk-custom.lisp:91 scm/skk-custom.lisp:218 scm/skk-custom.lisp:237
+#: scm/skk-custom.lisp:246 scm/skk-custom.lisp:277 scm/skk-custom.lisp:286
+#: scm/skk-custom.lisp:329 scm/skk-custom.lisp:335 scm/skk-custom.lisp:347
+#: scm/skk-custom.lisp:354 scm/skk-custom.lisp:361 scm/skk-custom.lisp:373
+#: scm/skk-custom.lisp:379 scm/skk-custom.lisp:385 scm/skk-custom.lisp:391
+#: scm/skk-custom.lisp:401 scm/skk-custom.lisp:407 scm/skk-custom.lisp:428
+#: scm/skk-custom.lisp:434 scm/skk-custom.lisp:441 scm/skk-key-custom.lisp:65
 #: scm/skk-key-custom.lisp:69 scm/skk-key-custom.lisp:73
 #: scm/skk-key-custom.lisp:78 scm/spellcheck-custom.lisp:48
 #: scm/spellcheck-custom.lisp:54 scm/spellcheck-custom.lisp:60
@@ -674,13 +675,13 @@
 msgstr ""
 
 #: scm/anthy-custom.lisp:77 scm/canna-custom.lisp:81
-#: scm/generic-custom.lisp:48 scm/skk-custom.lisp:64
+#: scm/generic-custom.lisp:48 scm/skk-custom.lisp:84
 #: scm/spellcheck-custom.lisp:53
 msgid "Conversion key press count to show candidate window"
 msgstr ""
 
 #: scm/anthy-custom.lisp:83 scm/canna-custom.lisp:87
-#: scm/generic-custom.lisp:54 scm/prime-custom.lisp:57 scm/skk-custom.lisp:70
+#: scm/generic-custom.lisp:54 scm/prime-custom.lisp:57 scm/skk-custom.lisp:90
 msgid "Number of candidates in candidate window at a time"
 msgstr ""
 
@@ -689,53 +690,53 @@
 msgstr ""
 
 #: scm/anthy-custom.lisp:119 scm/canna-custom.lisp:113
-#: scm/prime-custom.lisp:122 scm/skk-custom.lisp:114
+#: scm/prime-custom.lisp:122 scm/skk-custom.lisp:169
 msgid "Direct input"
 msgstr ""
 
-#: scm/anthy-custom.lisp:120 scm/canna-custom.lisp:114 scm/skk-custom.lisp:115
+#: scm/anthy-custom.lisp:120 scm/canna-custom.lisp:114 scm/skk-custom.lisp:170
 msgid "Direct input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:124 scm/canna-custom.lisp:118 scm/skk-custom.lisp:119
+#: scm/anthy-custom.lisp:124 scm/canna-custom.lisp:118 scm/skk-custom.lisp:174
 msgid "Hiragana"
 msgstr ""
 
-#: scm/anthy-custom.lisp:125 scm/canna-custom.lisp:119 scm/skk-custom.lisp:120
+#: scm/anthy-custom.lisp:125 scm/canna-custom.lisp:119 scm/skk-custom.lisp:175
 msgid "Hiragana input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:129 scm/canna-custom.lisp:123 scm/skk-custom.lisp:124
+#: scm/anthy-custom.lisp:129 scm/canna-custom.lisp:123 scm/skk-custom.lisp:179
 msgid "Katakana"
 msgstr ""
 
-#: scm/anthy-custom.lisp:130 scm/canna-custom.lisp:124 scm/skk-custom.lisp:125
+#: scm/anthy-custom.lisp:130 scm/canna-custom.lisp:124 scm/skk-custom.lisp:180
 msgid "Katakana input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:134 scm/canna-custom.lisp:128 scm/skk-custom.lisp:129
+#: scm/anthy-custom.lisp:134 scm/canna-custom.lisp:128 scm/skk-custom.lisp:184
 msgid "Halfwidth Katakana"
 msgstr ""
 
-#: scm/anthy-custom.lisp:135 scm/canna-custom.lisp:129 scm/skk-custom.lisp:130
+#: scm/anthy-custom.lisp:135 scm/canna-custom.lisp:129 scm/skk-custom.lisp:185
 msgid "Halfwidth Katakana input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:139 scm/canna-custom.lisp:133
-#: scm/prime-custom.lisp:132 scm/skk-custom.lisp:134
+#: scm/prime-custom.lisp:132 scm/skk-custom.lisp:189
 msgid "Fullwidth Alphanumeric"
 msgstr ""
 
 #: scm/anthy-custom.lisp:140 scm/canna-custom.lisp:134
-#: scm/prime-custom.lisp:133 scm/skk-custom.lisp:135
+#: scm/prime-custom.lisp:133 scm/skk-custom.lisp:190
 msgid "Fullwidth Alphanumeric input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:147 scm/canna-custom.lisp:141 scm/skk-custom.lisp:142
+#: scm/anthy-custom.lisp:147 scm/canna-custom.lisp:141 scm/skk-custom.lisp:197
 msgid "Romaji"
 msgstr ""
 
-#: scm/anthy-custom.lisp:148 scm/canna-custom.lisp:142 scm/skk-custom.lisp:143
+#: scm/anthy-custom.lisp:148 scm/canna-custom.lisp:142 scm/skk-custom.lisp:198
 msgid "Romaji input mode"
 msgstr ""
 
@@ -747,45 +748,45 @@
 msgid "Kana input mode"
 msgstr ""
 
-#: scm/anthy-custom.lisp:157 scm/canna-custom.lisp:151 scm/skk-custom.lisp:147
+#: scm/anthy-custom.lisp:157 scm/canna-custom.lisp:151 scm/skk-custom.lisp:202
 msgid "AZIK"
 msgstr ""
 
-#: scm/anthy-custom.lisp:158 scm/canna-custom.lisp:152 scm/skk-custom.lisp:148
+#: scm/anthy-custom.lisp:158 scm/canna-custom.lisp:152 scm/skk-custom.lisp:203
 msgid "AZIK extended romaji input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:167 scm/anthy-custom.lisp:168
-#: scm/canna-custom.lisp:161 scm/canna-custom.lisp:162 scm/skk-custom.lisp:157
-#: scm/skk-custom.lisp:158
+#: scm/canna-custom.lisp:161 scm/canna-custom.lisp:162 scm/skk-custom.lisp:212
+#: scm/skk-custom.lisp:213
 msgid "Input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:170 scm/anthy-custom.lisp:171
-#: scm/canna-custom.lisp:164 scm/canna-custom.lisp:165 scm/skk-custom.lisp:160
-#: scm/skk-custom.lisp:161
+#: scm/canna-custom.lisp:164 scm/canna-custom.lisp:165 scm/skk-custom.lisp:215
+#: scm/skk-custom.lisp:216
 msgid "Kana input method"
 msgstr ""
 
-#: scm/anthy-custom.lisp:172 scm/canna-custom.lisp:166 scm/skk-custom.lisp:162
+#: scm/anthy-custom.lisp:172 scm/canna-custom.lisp:166 scm/skk-custom.lisp:217
 msgid "Enabled toolbar buttons"
 msgstr ""
 
 #: scm/anthy-custom.lisp:191 scm/canna-custom.lisp:185
-#: scm/prime-custom.lisp:144 scm/skk-custom.lisp:181
+#: scm/prime-custom.lisp:144 scm/skk-custom.lisp:236
 msgid "Default input mode"
 msgstr ""
 
 #: scm/anthy-custom.lisp:200 scm/canna-custom.lisp:194
-#: scm/prime-custom.lisp:153 scm/skk-custom.lisp:190
+#: scm/prime-custom.lisp:153 scm/skk-custom.lisp:245
 msgid "Input mode menu items"
 msgstr ""
 
-#: scm/anthy-custom.lisp:242 scm/canna-custom.lisp:236 scm/skk-custom.lisp:221
+#: scm/anthy-custom.lisp:242 scm/canna-custom.lisp:236 scm/skk-custom.lisp:276
 msgid "Default kana input method"
 msgstr ""
 
-#: scm/anthy-custom.lisp:251 scm/canna-custom.lisp:245 scm/skk-custom.lisp:230
+#: scm/anthy-custom.lisp:251 scm/canna-custom.lisp:245 scm/skk-custom.lisp:285
 msgid "Kana input method menu items"
 msgstr ""
 
@@ -1284,11 +1285,11 @@
 msgid "Enabled input methods"
 msgstr ""
 
-#: scm/im-custom.lisp:276 scm/skk-custom.lisp:82 scm/skk-custom.lisp:316
+#: scm/im-custom.lisp:276 scm/skk-custom.lisp:70 scm/skk-custom.lisp:371
 msgid "uim"
 msgstr ""
 
-#: scm/im-custom.lisp:276 scm/skk-custom.lisp:82 scm/skk-custom.lisp:316
+#: scm/im-custom.lisp:276 scm/skk-custom.lisp:70 scm/skk-custom.lisp:371
 msgid "uim native"
 msgstr ""
 
@@ -1364,6 +1365,18 @@
 msgid "The directory which contains EB dictionary file"
 msgstr ""
 
+#: scm/im-custom.lisp:369
+msgid "XIM settings"
+msgstr ""
+
+#: scm/im-custom.lisp:375
+msgid "Use anti-aliased fonts for Over-the-Spot/Root-Window preedit"
+msgstr ""
+
+#: scm/im-custom.lisp:381
+msgid "Font name for preedit area (anti-aliased)"
+msgstr ""
+
 #: scm/ipa-x-sampa.lisp:227 scm/ipa-x-sampa.lisp:228
 msgid "International Phonetic Alphabet (X-SAMPA)"
 msgstr ""
@@ -1578,79 +1591,83 @@
 msgid "Advanced settings for SKK"
 msgstr ""
 
-#: scm/skk-custom.lisp:76
+#: scm/skk-custom.lisp:64
 msgid "Commit candidate by heading label keys"
 msgstr ""
 
-#: scm/skk-custom.lisp:83
+#: scm/skk-custom.lisp:71
 msgid "ddskk-like"
 msgstr ""
 
-#: scm/skk-custom.lisp:83 scm/skk-custom.lisp:315
+#: scm/skk-custom.lisp:71 scm/skk-custom.lisp:370
 msgid "Similar to ddskk"
 msgstr ""
 
-#: scm/skk-custom.lisp:84
+#: scm/skk-custom.lisp:72
 msgid "Candidate selection style"
 msgstr ""
 
-#: scm/skk-custom.lisp:273
+#: scm/skk-custom.lisp:78
+msgid "Set candidate window behavior manually"
+msgstr ""
+
+#: scm/skk-custom.lisp:328
 msgid "Use skkserv instead of SKK-JISYO"
 msgstr ""
 
-#: scm/skk-custom.lisp:279
+#: scm/skk-custom.lisp:334
 msgid "Port number of skkserv"
 msgstr ""
 
-#: scm/skk-custom.lisp:291
+#: scm/skk-custom.lisp:346
 msgid "Dictionary file"
 msgstr ""
 
-#: scm/skk-custom.lisp:298
+#: scm/skk-custom.lisp:353
 msgid "Personal dictionary file"
 msgstr ""
 
-#: scm/skk-custom.lisp:305
+#: scm/skk-custom.lisp:360
 msgid "Personal dictionary file (dedicated to uim)"
 msgstr ""
 
-#: scm/skk-custom.lisp:315
+#: scm/skk-custom.lisp:370
 msgid "ddskk"
 msgstr ""
 
-#: scm/skk-custom.lisp:317
+#: scm/skk-custom.lisp:372
 msgid "Visual style"
 msgstr ""
 
-#: scm/skk-custom.lisp:323
+#: scm/skk-custom.lisp:378
 msgid "Use recursive learning"
 msgstr ""
 
-#: scm/skk-custom.lisp:329
+#: scm/skk-custom.lisp:384
 msgid "Use numeric conversion"
 msgstr ""
 
-#: scm/skk-custom.lisp:335
+#: scm/skk-custom.lisp:390
 msgid "Enable auto conversion with punctuation marks"
 msgstr ""
 
-#: scm/skk-custom.lisp:345
+#: scm/skk-custom.lisp:400
 msgid "Show annotation of candidate word"
 msgstr ""
 
-#: scm/skk-custom.lisp:351
+#: scm/skk-custom.lisp:406
 msgid "Show annotation also in preedit area"
 msgstr ""
 
-#: scm/skk-custom.lisp:372
+#: scm/skk-custom.lisp:427
 msgid "Friendly for vi user"
 msgstr ""
 
-#: scm/skk-custom.lisp:378
+#: scm/skk-custom.lisp:433
 msgid "Use Enter key as just committing (egg-like operation)"
 msgstr ""
 
-#: scm/skk-custom.lisp:385
+#: scm/skk-custom.lisp:440
 msgid "Commit newline as ASCII string instead of native key-event"
 msgstr ""
 

Modified: trunk/scm/skk-custom.scm
===================================================================
--- trunk/scm/skk-custom.scm	2005-06-06 19:43:54 UTC (rev 870)
+++ trunk/scm/skk-custom.scm	2005-06-07 09:30:03 UTC (rev 871)
@@ -58,18 +58,6 @@
   (_ "Use candidate window")
   (_ "long description will be here."))
 
-(define-custom 'skk-candidate-op-count 2
-  '(skk candwin)
-  '(integer 0 99)
-  (_ "Conversion key press count to show candidate window")
-  (_ "long description will be here."))
-
-(define-custom 'skk-nr-candidate-max 10
-  '(skk candwin)
-  '(integer 1 20)
-  (_ "Number of candidates in candidate window at a time")
-  (_ "long description will be here."))
-
 (define-custom 'skk-commit-candidate-by-label-key? #t
   '(skk candwin)
   '(boolean)
@@ -84,23 +72,40 @@
   (_ "Candidate selection style")
   (_ "long description will be here."))
 
-; disabled since it has a side effect --ekato
-;(custom-add-hook 'skk-candidate-selection-style
-;		 'custom-set-hooks
-;		 (lambda ()
-;		   (if (= skk-candidate-selection-style 'ddskk-like)
-;		       (begin
-;			 (custom-set-value! 'skk-candidate-op-count 4)
-;			 (custom-set-value!
-;			  'skk-nr-candidate-max
-;			  (length skk-ddskk-like-heading-label-char-list)))
-;		       (begin	
-;			 (custom-set-value! 'skk-candidate-op-count 2)
-;			 (custom-set-value!
-;			  'skk-nr-candidate-max
-;			  (length skk-uim-heading-label-char-list))))))
+(define-custom 'skk-use-manual-candwin-setting? #f
+  '(skk candwin)
+  '(boolean)
+  (_ "Set candidate window behavior manually")
+  (_ "long description will be here."))
 
+(define-custom 'skk-candidate-op-count 2
+  '(skk candwin)
+  '(integer 0 99)
+  (_ "Conversion key press count to show candidate window")
+  (_ "long description will be here."))
+
+(define-custom 'skk-nr-candidate-max 10
+  '(skk candwin)
+  '(integer 1 20)
+  (_ "Number of candidates in candidate window at a time")
+  (_ "long description will be here."))
+
 ;; activity dependency
+(custom-add-hook 'skk-commit-candidate-by-label-key?
+		 'custom-activity-hooks
+		 (lambda ()
+		   skk-use-candidate-window?))
+
+(custom-add-hook 'skk-candidate-selection-style
+		 'custom-activity-hooks
+		 (lambda ()
+		   skk-use-candidate-window?))
+
+(custom-add-hook 'skk-use-manual-candwin-setting?
+		 'custom-activity-hooks
+		 (lambda ()
+		   skk-use-candidate-window?))
+
 (custom-add-hook 'skk-candidate-op-count
 		 'custom-activity-hooks
 		 (lambda ()
@@ -111,11 +116,45 @@
 		 (lambda ()
 		   skk-use-candidate-window?))
 
-(custom-add-hook 'skk-commit-candidate-by-label-key?
+(custom-add-hook 'skk-use-candidate-window?
+		 'custom-get-hooks
+		 (lambda ()
+		   (if (not skk-use-candidate-window?)
+		       (begin
+		         (set! skk-commit-candidate-by-label-key? #f)
+		         (set! skk-candidate-selection-style 'uim)
+			 (set! skk-use-manual-candwin-setting? #f)))))
+
+(custom-add-hook 'skk-candidate-op-count
 		 'custom-activity-hooks
 		 (lambda ()
-		   skk-use-candidate-window?))
+		   skk-use-manual-candwin-setting?))
 
+(custom-add-hook 'skk-nr-candidate-max
+		 'custom-activity-hooks
+		 (lambda ()
+		   skk-use-manual-candwin-setting?))
+		   
+(custom-add-hook 'skk-candidate-selection-style
+		 'custom-set-hooks
+		 (lambda ()
+		   (if (not skk-use-manual-candwin-setting?)
+		       (cond
+			((= skk-candidate-selection-style 'ddskk-like)
+			    (custom-set-value! 'skk-candidate-op-count 4)
+			    (custom-set-value! 'skk-nr-candidate-max 7))
+		        ((= skk-candidate-selection-style 'uim)
+			    (custom-set-value! 'skk-candidate-op-count 2)
+			    (custom-set-value! 'skk-nr-candidate-max 10))))))
+
+(custom-add-hook 'skk-use-manual-candwin-setting?
+		 'custom-set-hooks
+		 (lambda ()
+		   (if (not skk-use-manual-candwin-setting?)
+		       (custom-set-value!
+		        'skk-candidate-selection-style
+		        skk-candidate-selection-style))))
+
 ;;
 ;; toolbar
 ;;



More information about the uim-commit mailing list