[uim-commit] r2548 - in branches/1.0: po qt

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-12 03:30:11 -0800 (Mon, 12 Dec 2005)
New Revision: 2548

Modified:
   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/qt/pref-qt.cpp
Log:
* qt/pref-qt.cpp
* po/fr.po
* po/ja.po
* po/ko.po
* po/uim.pot
  - Port r2546, 2547 from trunk.


Modified: branches/1.0/po/fr.po
===================================================================
--- branches/1.0/po/fr.po	2005-12-12 10:22:53 UTC (rev 2547)
+++ branches/1.0/po/fr.po	2005-12-12 11:30:11 UTC (rev 2548)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: uim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 18:52+0900\n"
+"POT-Creation-Date: 2005-12-12 19:20+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"
@@ -545,7 +545,7 @@
 msgid "Key Grab Dialog"
 msgstr ""
 
-#: qt/pref-qt.cpp:113
+#: qt/pref-qt.cpp:114
 msgid "~/.uim exists!"
 msgstr ""
 
@@ -553,11 +553,15 @@
 msgid "Defaults"
 msgstr "Options par défaut"
 
-#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:352
+#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:351
 #: qt/switcher-qt.cpp:119
 msgid "OK"
 msgstr "OK"
 
+#: qt/pref-qt.cpp:162
+msgid "Apply"
+msgstr ""
+
 #: qt/pref-qt.cpp:166 qt/pref-qt.cpp:247 qt/switcher-qt.cpp:124
 msgid "Cancel"
 msgstr "Annuler"

Modified: branches/1.0/po/ja.po
===================================================================
--- branches/1.0/po/ja.po	2005-12-12 10:22:53 UTC (rev 2547)
+++ branches/1.0/po/ja.po	2005-12-12 11:30:11 UTC (rev 2548)
@@ -97,7 +97,7 @@
 msgstr ""
 "Project-Id-Version: uim 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 18:52+0900\n"
+"POT-Creation-Date: 2005-12-12 19:20+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"
@@ -653,7 +653,7 @@
 msgid "Key Grab Dialog"
 msgstr "キー取得ダイアログ"
 
-#: qt/pref-qt.cpp:113
+#: qt/pref-qt.cpp:114
 msgid "~/.uim exists!"
 msgstr "~/.uim が存在します！"
 
@@ -661,11 +661,15 @@
 msgid "Defaults"
 msgstr "標準"
 
-#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:352
+#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:351
 #: qt/switcher-qt.cpp:119
 msgid "OK"
 msgstr "OK"
 
+#: qt/pref-qt.cpp:162
+msgid "Apply"
+msgstr "適用"
+
 #: qt/pref-qt.cpp:166 qt/pref-qt.cpp:247 qt/switcher-qt.cpp:124
 msgid "Cancel"
 msgstr "キャンセル"

Modified: branches/1.0/po/ko.po
===================================================================
--- branches/1.0/po/ko.po	2005-12-12 10:22:53 UTC (rev 2547)
+++ branches/1.0/po/ko.po	2005-12-12 11:30:11 UTC (rev 2548)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: uim 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 18:52+0900\n"
+"POT-Creation-Date: 2005-12-12 19:20+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"
@@ -554,7 +554,7 @@
 msgid "Key Grab Dialog"
 msgstr "키 잡기 대화창"
 
-#: qt/pref-qt.cpp:113
+#: qt/pref-qt.cpp:114
 msgid "~/.uim exists!"
 msgstr "~/.uim 가 있습니다!"
 
@@ -562,11 +562,15 @@
 msgid "Defaults"
 msgstr "디폴트"
 
-#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:352
+#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:351
 #: qt/switcher-qt.cpp:119
 msgid "OK"
 msgstr "확인"
 
+#: qt/pref-qt.cpp:162
+msgid "Apply"
+msgstr ""
+
 #: qt/pref-qt.cpp:166 qt/pref-qt.cpp:247 qt/switcher-qt.cpp:124
 msgid "Cancel"
 msgstr "취소"

Modified: branches/1.0/po/uim.pot
===================================================================
--- branches/1.0/po/uim.pot	2005-12-12 10:22:53 UTC (rev 2547)
+++ branches/1.0/po/uim.pot	2005-12-12 11:30:11 UTC (rev 2548)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 18:52+0900\n"
+"POT-Creation-Date: 2005-12-12 19:20+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"
@@ -546,7 +546,7 @@
 msgid "Key Grab Dialog"
 msgstr ""
 
-#: qt/pref-qt.cpp:113
+#: qt/pref-qt.cpp:114
 msgid "~/.uim exists!"
 msgstr ""
 
@@ -554,11 +554,15 @@
 msgid "Defaults"
 msgstr ""
 
-#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:352
+#: qt/pref-qt.cpp:159 qt/pref-qt.cpp:246 qt/pref-qt.cpp:351
 #: qt/switcher-qt.cpp:119
 msgid "OK"
 msgstr ""
 
+#: qt/pref-qt.cpp:162
+msgid "Apply"
+msgstr ""
+
 #: qt/pref-qt.cpp:166 qt/pref-qt.cpp:247 qt/switcher-qt.cpp:124
 msgid "Cancel"
 msgstr ""

Modified: branches/1.0/qt/pref-qt.cpp
===================================================================
--- branches/1.0/qt/pref-qt.cpp	2005-12-12 10:22:53 UTC (rev 2547)
+++ branches/1.0/qt/pref-qt.cpp	2005-12-12 11:30:11 UTC (rev 2548)
@@ -159,7 +159,7 @@
     QPushButton *okButton = new QPushButton( _("OK"), buttonHWidget );
     QObject::connect( okButton, SIGNAL(clicked()),
                       this, SLOT(slotOK()) );
-    m_applyButton = new QPushButton( "Apply", buttonHWidget );
+    m_applyButton = new QPushButton( _("Apply"), buttonHWidget );
     m_applyButton->setEnabled( false );
     QObject::connect( m_applyButton, SIGNAL(clicked()),
                       this, SLOT(slotApply()) );
@@ -264,7 +264,7 @@
                                           "Do you realy quit this program?"),
                                         _("Yes"),
                                         _("No"),
-                                        QString::null, 0, 1);
+                                        QString::null, 1, -1);
     switch(result)
     {
     case 0: