fix display in Edit macro button, update PO

git-svn-id: svn://localhost/trunk@47 79bd180b-0a32-48ee-ac55-ada8cae9df61

diff --git a/po/scim-unikey.pot b/po/scim-unikey.pot
index 5ce3297..ff34ef4 100644 (file)
--- a/po/scim-unikey.pot
+++ b/po/scim-unikey.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scim-unikey 0.3~r32\n"
 "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n"
-"POT-Creation-Date: 2009-07-08 22:56+0700\n"
+"POT-Creation-Date: 2009-07-14 22:57+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Configure Unikey here"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:724 setup/setup-main.glade:144
+#: src/scim_unikey_imengine.cpp:724 setup/setup-main.glade:146
 msgid "Enable spell check"
 msgstr ""
 
@@ -61,7 +61,7 @@ msgstr ""
 msgid "If enable, you can decrease mistake when typing"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:732 setup/setup-main.glade:156
+#: src/scim_unikey_imengine.cpp:732 setup/setup-main.glade:158
 msgid "Auto restore keys with invalid words"
 msgstr ""
 
@@ -71,11 +71,11 @@ msgid ""
 "it will auto restore keystroke into original"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:741 setup/setup-main.glade:168
+#: src/scim_unikey_imengine.cpp:741 setup/setup-main.glade:170
 msgid "Use oà, uý (instead of òa, úy)"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:749 setup/setup-main.glade:180
+#: src/scim_unikey_imengine.cpp:749 setup/setup-main.glade:182
 msgid "Allow type with more freedom"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Enable Macro"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:764 setup/setup-main.glade:239
+#: src/scim_unikey_imengine.cpp:764 setup/setup-main.glade:242
 msgid "Enable PreEdit"
 msgstr ""
 
@@ -138,42 +138,34 @@ msgstr ""
 msgid "Replace with"
 msgstr ""
 
-#: setup/setup-main.glade:58
+#: setup/setup-main.glade:59
 msgid "Input method:"
 msgstr ""
 
-#: setup/setup-main.glade:69
+#: setup/setup-main.glade:70
 msgid "Output charset: "
 msgstr ""
 
-#: setup/setup-main.glade:119
+#: setup/setup-main.glade:121
 msgid "<b>Input/Output</b>"
 msgstr ""
 
-#: setup/setup-main.glade:195
+#: setup/setup-main.glade:197
 msgid "Enable _macro"
 msgstr ""
 
-#: setup/setup-main.glade:208
+#: setup/setup-main.glade:210
 msgid "_Edit macro"
 msgstr ""
 
-#: setup/setup-main.glade:226
+#: setup/setup-main.glade:229
 msgid "Process _W at word begin"
 msgstr ""
 
-#: setup/setup-main.glade:256
+#: setup/setup-main.glade:259
 msgid "<b>Options</b>"
 msgstr ""
 
-#: setup/setup-main.glade:276 setup/setup-macro.glade:101
-msgid "gtk-ok"
-msgstr ""
-
-#: setup/setup-main.glade:290 setup/setup-macro.glade:115
-msgid "gtk-cancel"
-msgstr ""
-
 #: setup/setup-macro.glade:15
 msgid "Macro table definition"
 msgstr ""
@@ -185,3 +177,11 @@ msgstr ""
 #: setup/setup-macro.glade:71
 msgid "Delete _all"
 msgstr ""
+
+#: setup/setup-macro.glade:101
+msgid "gtk-ok"
+msgstr ""
+
+#: setup/setup-macro.glade:115
+msgid "gtk-cancel"
+msgstr ""

diff --git a/po/vi.po b/po/vi.po
index 9227c46..17ac77d 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scim-unikey\n"
 "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n"
-"POT-Creation-Date: 2009-07-08 22:56+0700\n"
+"POT-Creation-Date: 2009-07-14 22:57+0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Le Quoc Tuan <mr.lequoctuan@gmail.com>\n"
 "Language-Team: Le Quoc Tuan <mr.lequoctuan@gmail.com>\n"
@@ -67,7 +67,7 @@ msgstr "Tùy chọn"
 msgid "Configure Unikey here"
 msgstr "Cấu hình Unikey ở đây"
 
-#: src/scim_unikey_imengine.cpp:724 setup/setup-main.glade:144
+#: src/scim_unikey_imengine.cpp:724 setup/setup-main.glade:146
 msgid "Enable spell check"
 msgstr "Bật kiểm tra chính tả"
 
@@ -75,7 +75,7 @@ msgstr "Bật kiểm tra chính tả"
 msgid "If enable, you can decrease mistake when typing"
 msgstr "Nếu bật, bạn có thể giảm lỗi chính tả khi gõ"
 
-#: src/scim_unikey_imengine.cpp:732 setup/setup-main.glade:156
+#: src/scim_unikey_imengine.cpp:732 setup/setup-main.glade:158
 msgid "Auto restore keys with invalid words"
 msgstr "Tự động khôi phục phím với từ sai"
 
@@ -87,11 +87,11 @@ msgstr ""
 "Khi gõ một từ không phải tiếng Việt,\n"
 "nó sẽ tự động khôi phục phím gốc"
 
-#: src/scim_unikey_imengine.cpp:741 setup/setup-main.glade:168
+#: src/scim_unikey_imengine.cpp:741 setup/setup-main.glade:170
 msgid "Use oà, uý (instead of òa, úy)"
 msgstr "Đặt dấu oà, uý (thay vì òa, úy)"
 
-#: src/scim_unikey_imengine.cpp:749 setup/setup-main.glade:180
+#: src/scim_unikey_imengine.cpp:749 setup/setup-main.glade:182
 msgid "Allow type with more freedom"
 msgstr "Cho phép gõ tự do"
 
@@ -99,7 +99,7 @@ msgstr "Cho phép gõ tự do"
 msgid "Enable Macro"
 msgstr "Cho phép gõ tắt"
 
-#: src/scim_unikey_imengine.cpp:764 setup/setup-main.glade:239
+#: src/scim_unikey_imengine.cpp:764 setup/setup-main.glade:242
 msgid "Enable PreEdit"
 msgstr "Bật PreEdit"
 
@@ -161,42 +161,34 @@ msgstr "Từ"
 msgid "Replace with"
 msgstr "Thay thế với"
 
-#: setup/setup-main.glade:58
+#: setup/setup-main.glade:59
 msgid "Input method:"
 msgstr "Kiểu gõ: "
 
-#: setup/setup-main.glade:69
+#: setup/setup-main.glade:70
 msgid "Output charset: "
 msgstr "Bảng mã: "
 
-#: setup/setup-main.glade:119
+#: setup/setup-main.glade:121
 msgid "<b>Input/Output</b>"
 msgstr "<b>Nhập/Xuất</b>"
 
-#: setup/setup-main.glade:195
+#: setup/setup-main.glade:197
 msgid "Enable _macro"
 msgstr "Bật gõ tắt"
 
-#: setup/setup-main.glade:208
+#: setup/setup-main.glade:210
 msgid "_Edit macro"
 msgstr "Sửa bảng gõ tắt"
 
-#: setup/setup-main.glade:226
+#: setup/setup-main.glade:229
 msgid "Process _W at word begin"
 msgstr "Sử lý phím _W ở đầu từ"
 
-#: setup/setup-main.glade:256
+#: setup/setup-main.glade:259
 msgid "<b>Options</b>"
 msgstr "<b>Tùy chọn</b>"
 
-#: setup/setup-main.glade:276 setup/setup-macro.glade:101
-msgid "gtk-ok"
-msgstr ""
-
-#: setup/setup-main.glade:290 setup/setup-macro.glade:115
-msgid "gtk-cancel"
-msgstr ""
-
 #: setup/setup-macro.glade:15
 msgid "Macro table definition"
 msgstr "Định nghĩa bảng gõ tắt"
@@ -208,3 +200,11 @@ msgstr ""
 #: setup/setup-macro.glade:71
 msgid "Delete _all"
 msgstr "Xóa _hết"
+
+#: setup/setup-macro.glade:101
+msgid "gtk-ok"
+msgstr ""
+
+#: setup/setup-macro.glade:115
+msgid "gtk-cancel"
+msgstr ""

diff --git a/setup/setup-main.glade b/setup/setup-main.glade
index f2645b0..2db10cc 100644 (file)
--- a/setup/setup-main.glade
+++ b/setup/setup-main.glade
@@ -50,6 +50,7 @@
                         <child>
                           <object class="GtkVBox" id="vbox11">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <property name="homogeneous">True</property>
                             <child>
                               <object class="GtkLabel" id="label3">
@@ -82,6 +83,7 @@
                         <child>
                           <object class="GtkVBox" id="vbox12">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkComboBox" id="cbb_input_method">
                                 <property name="visible">True</property>
@@ -210,6 +212,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="image">img_edit</property>
+                                <property name="use_underline">True</property>
                               </object>
                               <packing>
                                 <property name="fill">False</property>
@@ -273,7 +276,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btn_main_ok">
-                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -287,7 +290,7 @@
             </child>
             <child>
               <object class="GtkButton" id="btn_main_cancel">
-                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>