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

yamaken at freedesktop.org yamaken at freedesktop.org
Mon Feb 7 10:09:18 PST 2005 

Author: yamaken
Date: 2005-02-07 10:09:16 -0800 (Mon, 07 Feb 2005)
New Revision: 605

Modified:
   trunk/po/ja.po
   trunk/po/uim.pot
   trunk/scm/anthy-key-custom.scm
   trunk/scm/canna-key-custom.scm
   trunk/scm/im-custom.scm
   trunk/scm/skk-key-custom.scm
Log:
* scm/anthy-key-custom.scm
* scm/canna-key-custom.scm
* scm/skk-key-custom.scm
  - Replace the messages "commit preedit string as" with "commit as"
    to simplify them. Thanks UTUMI Hirosi for your opinion

* scm/im-custom.scm
  - (custom candidate-window-position): Replace the word 'caret' with
    'cursor'
* po/ja.po
* po/uim.pot
  - Update
  - Standardize some Japanese words. See header commnt of
    ja.po. Thanks No.318 of [Anthy/uim thread 5].


Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2005-02-07 17:57:45 UTC (rev 604)
+++ trunk/po/ja.po	2005-02-07 18:09:16 UTC (rev 605)
@@ -3,12 +3,18 @@
 # This file is distributed under the same license as the uim package.
 #  TOKUNAGA Hiroyuki <tkng at xem.jp>.
 #
+# ÆüËܸìÌõ¤Ë»ÈÍѤ¹¤ëÍѸì (Ŭµ¹Äɲ䪴ꤤ¤·¤Þ¤¹):
+# input method ¢ª ÆþÎÏÊý¼°
+# preedit      ¢ª ÊÔ½¸Îΰè
+# commit       ¢ª ³ÎÄê
+# use          ¢ª »ÈÍÑ
+# enable       ¢ª Í­¸ú
 msgid ""
 msgstr ""
 "Project-Id-Version: uim 0.4.6-alpha1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-07 13:10+0900\n"
-"PO-Revision-Date: 2005-02-07 13:11+0900\n"
+"POT-Creation-Date: 2005-02-08 02:49+0900\n"
+"PO-Revision-Date: 2005-02-08 02:58+0900\n"
 "Last-Translator: YamaKen <yamaken at bp.iij4u.or.jp>\n"
 "Language-Team: Japanese <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -348,7 +354,7 @@
 "ÀßÄ꤬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 "ËÜÅö¤Ë½ªÎ»¤·¤Þ¤¹¤«?"
 
-#: helper/pref-gtk.c:214 qt/pref-qt.cpp:103
+#: helper/pref-gtk.c:214 qt/pref-qt.cpp:137
 msgid "Group"
 msgstr "¥°¥ë¡¼¥×"
 
@@ -435,11 +441,12 @@
 msgid "line"
 msgstr "Àþ"
 
-#: qt/switcher-qt.cpp:116 qt/pref-qt.cpp:124 qt/pref-qt.cpp:262
+#: qt/switcher-qt.cpp:116 qt/pref-qt.cpp:158 qt/pref-qt.cpp:236
+#: qt/pref-qt.cpp:318
 msgid "OK"
 msgstr "OK"
 
-#: qt/switcher-qt.cpp:121 qt/pref-qt.cpp:131 qt/pref-qt.cpp:263
+#: qt/switcher-qt.cpp:121 qt/pref-qt.cpp:165 qt/pref-qt.cpp:237
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
 
@@ -452,11 +459,31 @@
 msgid "exec Preference Application"
 msgstr "ÀßÄê¥Ä¡¼¥ë¤Îµ¯Æ°"
 
-#: qt/pref-qt.cpp:121
+#: qt/pref-qt.cpp:106
+msgid ""
+"The user customize file \"~/.uim\" is found.\n"
+"This file will override all conflicted settings set by\n"
+"this tool (stored in ~/.uim.d/customs/*.scm).\n"
+"Please check the file if you find your settings aren't applied"
+msgstr ""
+"¥æ¡¼¥¶ÀßÄê¥Õ¥¡¥¤¥ë \"~/.uim\" ¤¬Â¸ºß¤·¤Þ¤¹¡£\n"
+"¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍƤϡ¢¤³¤Î¥Ä¡¼¥ë¤ÇÀßÄꤷ¤¿ÀßÄêÆâÍÆ\n"
+"(\"~/.uim.d/customs/*.scm\") ¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£\n"
+"ÀßÄ꤬ȿ±Ç¤µ¤ì¤Ê¤¤¾ì¹ç¤Ï¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£"
+
+#: qt/pref-qt.cpp:113
+msgid "~/.uim exists!"
+msgstr ""
+
+#: qt/pref-qt.cpp:155
 msgid "Defaults"
 msgstr "¥Ç¥Õ¥©¥ë¥È"
 
-#: qt/pref-qt.cpp:199
+#: qt/pref-qt.cpp:234
+msgid "Save Confirm"
+msgstr ""
+
+#: qt/pref-qt.cpp:235
 msgid ""
 "The value was changed.\n"
 "Save?"
@@ -464,11 +491,15 @@
 "ÀßÄ꤬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 "¥»¡¼¥Ö¤·¤Þ¤¹¤«?"
 
+#: qt/pref-qt.cpp:313
+msgid "Show this dialog on startup"
+msgstr ""
+
 #: qt/pref-customwidgets.cpp:172
 msgid "File"
 msgstr "»²¾È"
 
-#: qt/pref-customwidgets.cpp:309 qt/pref-customwidgets.cpp:589
+#: qt/pref-customwidgets.cpp:310 qt/pref-customwidgets.cpp:592
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
@@ -749,23 +780,23 @@
 
 # "Á´³Ñ±Ñ¿ô³ÎÄê"¤È¤·¤Ê¤¤¤Î¤Ïñ¸ì¶­³¦¤Îǧ¼±¤òÍưפˤ¹¤ë¤¿¤á  -- YamaKen  2005-02-02
 #: scm/anthy-key-custom.lisp:75
-msgid "[Anthy] commit preedit string as halfwidth alphanumeric"
+msgid "[Anthy] commit as halfwidth alphanumeric"
 msgstr "[Anthy] Ⱦ³Ñ±Ñ¿ô¤È¤·¤Æ³ÎÄê"
 
 #: scm/anthy-key-custom.lisp:81
-msgid "[Anthy] commit preedit string as fullwidth alphanumeric"
+msgid "[Anthy] commit as fullwidth alphanumeric"
 msgstr "[Anthy] Á´³Ñ±Ñ¿ô¤È¤·¤Æ³ÎÄê"
 
 #: scm/anthy-key-custom.lisp:87
-msgid "[Anthy] commit preedit string as katakana"
+msgid "[Anthy] commit as katakana"
 msgstr "[Anthy] ¥«¥¿¥«¥Ê¤È¤·¤Æ³ÎÄê"
 
 #: scm/anthy-key-custom.lisp:93
-msgid "[Anthy] commit preedit string as halfwidth katakana"
+msgid "[Anthy] commit as halfwidth katakana"
 msgstr "[Anthy] Ⱦ³Ñ¥«¥¿¥«¥Ê¤È¤·¤Æ³ÎÄê"
 
 #: scm/anthy-key-custom.lisp:99
-msgid "[Anthy] commit preedit string as transposed kana"
+msgid "[Anthy] commit as transposed kana"
 msgstr "[Anthy] ¤«¤Ê/¥«¥Êȿž³ÎÄê"
 
 #: scm/anthy-key-custom.lisp:105
@@ -893,7 +924,7 @@
 msgstr "[Canna] ʸÀá¤òû½Ì"
 
 #: scm/canna-key-custom.lisp:75
-msgid "[Canna] commit preedit string as transposed kana"
+msgid "[Canna] commit as transposed kana"
 msgstr "[Canna] ¤«¤Ê/¥«¥Êȿž³ÎÄê"
 
 #: scm/canna-key-custom.lisp:81
@@ -1166,11 +1197,11 @@
 
 #: scm/im-custom.lisp:274
 msgid "Preedit color"
-msgstr "¥×¥ê¥¨¥Ç¥£¥Ã¥È¿§"
+msgstr "ÊÔ½¸Îΰ迧"
 
 #: scm/im-custom.lisp:282 scm/im-custom.lisp:283
-msgid "Adjacent to caret"
-msgstr "¥­¥ã¥ì¥Ã¥È¤ËÎÙÀÜ"
+msgid "Adjacent to cursor"
+msgstr "¥«¡¼¥½¥ë¤ËÎÙÀÜ"
 
 #: scm/im-custom.lisp:285 scm/im-custom.lisp:286
 msgid "Left end of preedit area"
@@ -1448,7 +1479,7 @@
 
 #: scm/skk-custom.lisp:235
 msgid "Show annotation also in preedit area"
-msgstr "¥×¥ê¥¨¥Ç¥£¥Ã¥ÈÆâ¤Ë¤âÃð¼á¤òɽ¼¨¤¹¤ë"
+msgstr "ÊÔ½¸ÎΰèÆâ¤Ë¤âÃð¼á¤òɽ¼¨¤¹¤ë"
 
 #: scm/skk-custom.lisp:256
 msgid "Friendly for vi user"
@@ -1456,11 +1487,11 @@
 
 #: scm/skk-custom.lisp:262
 msgid "Use Enter key as just committing (egg-like operation)"
-msgstr "Enter¥­¡¼¤òñ¤Ë¥³¥ß¥Ã¥È¤Î¤¿¤á¤Ë»È¤¦ (eggÉ÷¤ÎÁàºî)"
+msgstr "Enter¥­¡¼¤òñ¤Ë³ÎÄê¤Î¤¿¤á¤Ë»È¤¦ (eggÉ÷¤ÎÁàºî)"
 
 #: scm/skk-custom.lisp:269
 msgid "Commit newline as ASCII string instead of native key-event"
-msgstr "¿·µ¬¹Ô¤ò¥Í¥¤¥Æ¥£¥Ö¥­¡¼¥¤¥Ù¥ó¥È¤ÎÂå¤ï¤ê¤ËASCIIʸ»úÎó¤È¤·¤Æ¥³¥ß¥Ã¥È¤¹¤ë"
+msgstr "¿·µ¬¹Ô¤ò¥Í¥¤¥Æ¥£¥Ö¥­¡¼¥¤¥Ù¥ó¥È¤ÎÂå¤ï¤ê¤ËASCIIʸ»úÎó¤È¤·¤Æ³ÎÄꤹ¤ë"
 
 #: scm/skk-key-custom.lisp:64
 msgid "SKK key bindings 1"
@@ -1519,7 +1550,7 @@
 msgstr "[SKK] ¥ê¥¿¡¼¥ó"
 
 #: scm/skk-key-custom.lisp:148
-msgid "[SKK] commit preedit string as fullwidth alphanumeric"
+msgid "[SKK] commit as fullwidth alphanumeric"
 msgstr "[SKK] Á´³Ñ±Ñ¿ô¤È¤·¤Æ³ÎÄê"
 
 #: scm/skk-key-custom.lisp:154

Modified: trunk/po/uim.pot
===================================================================
--- trunk/po/uim.pot	2005-02-07 17:57:45 UTC (rev 604)
+++ trunk/po/uim.pot	2005-02-07 18:09:16 UTC (rev 605)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-07 13:10+0900\n"
+"POT-Creation-Date: 2005-02-08 02:49+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"
@@ -345,7 +345,7 @@
 "Do you realy quit this program?"
 msgstr ""
 
-#: helper/pref-gtk.c:214 qt/pref-qt.cpp:103
+#: helper/pref-gtk.c:214 qt/pref-qt.cpp:137
 msgid "Group"
 msgstr ""
 
@@ -428,11 +428,12 @@
 msgid "line"
 msgstr ""
 
-#: qt/switcher-qt.cpp:116 qt/pref-qt.cpp:124 qt/pref-qt.cpp:262
+#: qt/switcher-qt.cpp:116 qt/pref-qt.cpp:158 qt/pref-qt.cpp:236
+#: qt/pref-qt.cpp:318
 msgid "OK"
 msgstr ""
 
-#: qt/switcher-qt.cpp:121 qt/pref-qt.cpp:131 qt/pref-qt.cpp:263
+#: qt/switcher-qt.cpp:121 qt/pref-qt.cpp:165 qt/pref-qt.cpp:237
 msgid "Cancel"
 msgstr ""
 
@@ -445,21 +446,41 @@
 msgid "exec Preference Application"
 msgstr ""
 
-#: qt/pref-qt.cpp:121
+#: qt/pref-qt.cpp:106
+msgid ""
+"The user customize file \"~/.uim\" is found.\n"
+"This file will override all conflicted settings set by\n"
+"this tool (stored in ~/.uim.d/customs/*.scm).\n"
+"Please check the file if you find your settings aren't applied"
+msgstr ""
+
+#: qt/pref-qt.cpp:113
+msgid "~/.uim exists!"
+msgstr ""
+
+#: qt/pref-qt.cpp:155
 msgid "Defaults"
 msgstr ""
 
-#: qt/pref-qt.cpp:199
+#: qt/pref-qt.cpp:234
+msgid "Save Confirm"
+msgstr ""
+
+#: qt/pref-qt.cpp:235
 msgid ""
 "The value was changed.\n"
 "Save?"
 msgstr ""
 
+#: qt/pref-qt.cpp:313
+msgid "Show this dialog on startup"
+msgstr ""
+
 #: qt/pref-customwidgets.cpp:172
 msgid "File"
 msgstr ""
 
-#: qt/pref-customwidgets.cpp:309 qt/pref-customwidgets.cpp:589
+#: qt/pref-customwidgets.cpp:310 qt/pref-customwidgets.cpp:592
 msgid "Edit"
 msgstr ""
 
@@ -739,23 +760,23 @@
 msgstr ""
 
 #: scm/anthy-key-custom.lisp:75
-msgid "[Anthy] commit preedit string as halfwidth alphanumeric"
+msgid "[Anthy] commit as halfwidth alphanumeric"
 msgstr ""
 
 #: scm/anthy-key-custom.lisp:81
-msgid "[Anthy] commit preedit string as fullwidth alphanumeric"
+msgid "[Anthy] commit as fullwidth alphanumeric"
 msgstr ""
 
 #: scm/anthy-key-custom.lisp:87
-msgid "[Anthy] commit preedit string as katakana"
+msgid "[Anthy] commit as katakana"
 msgstr ""
 
 #: scm/anthy-key-custom.lisp:93
-msgid "[Anthy] commit preedit string as halfwidth katakana"
+msgid "[Anthy] commit as halfwidth katakana"
 msgstr ""
 
 #: scm/anthy-key-custom.lisp:99
-msgid "[Anthy] commit preedit string as transposed kana"
+msgid "[Anthy] commit as transposed kana"
 msgstr ""
 
 #: scm/anthy-key-custom.lisp:105
@@ -883,7 +904,7 @@
 msgstr ""
 
 #: scm/canna-key-custom.lisp:75
-msgid "[Canna] commit preedit string as transposed kana"
+msgid "[Canna] commit as transposed kana"
 msgstr ""
 
 #: scm/canna-key-custom.lisp:81
@@ -1159,7 +1180,7 @@
 msgstr ""
 
 #: scm/im-custom.lisp:282 scm/im-custom.lisp:283
-msgid "Adjacent to caret"
+msgid "Adjacent to cursor"
 msgstr ""
 
 #: scm/im-custom.lisp:285 scm/im-custom.lisp:286
@@ -1509,7 +1530,7 @@
 msgstr ""
 
 #: scm/skk-key-custom.lisp:148
-msgid "[SKK] commit preedit string as fullwidth alphanumeric"
+msgid "[SKK] commit as fullwidth alphanumeric"
 msgstr ""
 
 #: scm/skk-key-custom.lisp:154

Modified: trunk/scm/anthy-key-custom.scm
===================================================================
--- trunk/scm/anthy-key-custom.scm	2005-02-07 17:57:45 UTC (rev 604)
+++ trunk/scm/anthy-key-custom.scm	2005-02-07 18:09:16 UTC (rev 605)
@@ -72,31 +72,31 @@
 (define-custom 'anthy-commit-as-latin-key '("F10")
                '(anthy-keys1)
 	       '(key)
-	       (_ "[Anthy] commit preedit string as halfwidth alphanumeric")
+	       (_ "[Anthy] commit as halfwidth alphanumeric")
 	       (_ "long description will be here"))
 
 (define-custom 'anthy-commit-as-wide-latin-key '("F9")
                '(anthy-keys1)
 	       '(key)
-	       (_ "[Anthy] commit preedit string as fullwidth alphanumeric")
+	       (_ "[Anthy] commit as fullwidth alphanumeric")
 	       (_ "long description will be here"))
 
 (define-custom 'anthy-commit-as-katakana-key '("F7")
                '(anthy-keys1)
 	       '(key)
-	       (_ "[Anthy] commit preedit string as katakana")
+	       (_ "[Anthy] commit as katakana")
 	       (_ "long description will be here"))
 
 (define-custom 'anthy-commit-as-hankana-key '("F8")
                '(anthy-keys1)
 	       '(key)
-	       (_ "[Anthy] commit preedit string as halfwidth katakana")
+	       (_ "[Anthy] commit as halfwidth katakana")
 	       (_ "long description will be here"))
 
 (define-custom 'anthy-commit-as-opposite-kana-key '()
                '(anthy-keys1)
 	       '(key)
-	       (_ "[Anthy] commit preedit string as transposed kana")
+	       (_ "[Anthy] commit as transposed kana")
 	       (_ "long description will be here"))
 
 (define-custom 'anthy-wide-latin-key '()

Modified: trunk/scm/canna-key-custom.scm
===================================================================
--- trunk/scm/canna-key-custom.scm	2005-02-07 17:57:45 UTC (rev 604)
+++ trunk/scm/canna-key-custom.scm	2005-02-07 18:09:16 UTC (rev 605)
@@ -72,7 +72,7 @@
 (define-custom 'canna-commit-as-opposite-kana-key '("<IgnoreCase><Shift>q")  ;; "Q"
                '(canna-keys1)
 	       '(key)
-	       (_ "[Canna] commit preedit string as transposed kana")
+	       (_ "[Canna] commit as transposed kana")
 	       (_ "long description will be here"))
 
 (define-custom 'canna-wide-latin-key '("<IgnoreCase><Shift>l")  ;; "L"

Modified: trunk/scm/im-custom.scm
===================================================================
--- trunk/scm/im-custom.scm	2005-02-07 17:57:45 UTC (rev 604)
+++ trunk/scm/im-custom.scm	2005-02-07 18:09:16 UTC (rev 605)
@@ -279,8 +279,8 @@
   '(global visual-preference)
   (list 'choice
 	(list 'caret
-	      (_ "Adjacent to caret")
-	      (_ "Adjacent to caret"))
+	      (_ "Adjacent to cursor")
+	      (_ "Adjacent to cursor"))
 	(list 'left
 	      (_ "Left end of preedit area")
 	      (_ "Left end of preedit area"))

Modified: trunk/scm/skk-key-custom.scm
===================================================================
--- trunk/scm/skk-key-custom.scm	2005-02-07 17:57:45 UTC (rev 604)
+++ trunk/scm/skk-key-custom.scm	2005-02-07 18:09:16 UTC (rev 605)
@@ -145,7 +145,7 @@
 (define-custom 'skk-conv-wide-latin-key '("<IgnoreCase><Control>q")
                '(skk-keys2)
 	       '(key)
-	       (_ "[SKK] commit preedit string as fullwidth alphanumeric")
+	       (_ "[SKK] commit as fullwidth alphanumeric")
 	       (_ "long description will be here"))
 
 (define-custom 'skk-latin-conv-key '("/")

More information about the Uim-commit mailing list