[anjuta] Updated Thai translation.



commit 9b877525f4f3a444e8e36dd940b45b1befbc8a0e
Author: Akom C <knight2000 gmail com>
Date:   Wed Jun 3 20:53:41 2009 +0700

    Updated Thai translation.
---
 po/th.po | 2528 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1385 insertions(+), 1143 deletions(-)

diff --git a/po/th.po b/po/th.po
index b3b841a..b8852e1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,9 +7,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-01 11:30+0700\n"
-"PO-Revision-Date: 2009-04-29 18:26+0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=anjuta&component=core application\n"
+"POT-Creation-Date: 2009-05-30 15:27+0000\n"
+"PO-Revision-Date: 2009-06-03 20:33+0700\n"
 "Last-Translator: Akom C. <knight2000 gmail com>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -184,8 +185,8 @@ msgid "Thai"
 msgstr "��ย"
 
 #: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:3205
-#: ../plugins/gbf-am/gbf-am-properties.c:130
-#: ../plugins/gbf-am/gbf-am-properties.c:174
+#: ../plugins/gbf-am/gbf-am-properties.c:129
+#: ../plugins/gbf-am/gbf-am-properties.c:173
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3093
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:104
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:148
@@ -228,7 +229,7 @@ msgstr ""
 "%s"
 
 #: ../libanjuta/anjuta-plugin-manager.c:901
-#: ../plugins/symbol-db/symbol-db-prefs.c:451
+#: ../plugins/symbol-db/symbol-db-prefs.c:457
 msgid "Load"
 msgstr "�หล�"
 
@@ -237,7 +238,7 @@ msgstr "�หล�"
 msgid "Available Plugins"
 msgstr "�ลั��อิ��ี�มีอยู�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:665
+#: ../libanjuta/anjuta-plugin-manager.c:1036 ../src/anjuta-app.c:670
 msgid "Preferred plugins"
 msgstr "�ลั��อิ��ี��ลือ����"
 
@@ -381,7 +382,7 @@ msgstr ""
 "อ�า� '%s' �ม�สำ�ร��: �า��ลั��อิ��ี��ำ������อ���ี�:\n"
 "%s"
 
-#: ../libanjuta/anjuta-preferences.c:1589
+#: ../libanjuta/anjuta-preferences.c:1528
 msgid ""
 "Are you sure you want to reset the preferences to\n"
 "their default settings?"
@@ -389,7 +390,7 @@ msgstr "ยื�ยั�ว�า��อ��ารล�า���า�
 
 #. Action name
 #. Stock icon, if any
-#: ../libanjuta/anjuta-preferences.c:1593 ../plugins/git/plugin.c:203
+#: ../libanjuta/anjuta-preferences.c:1532 ../plugins/git/plugin.c:365
 msgid "_Reset"
 msgstr "_ล�า���า"
 
@@ -401,8 +402,8 @@ msgstr "�ระ�ภ�"
 #. FIXME: Make the general page first
 #: ../libanjuta/anjuta-preferences-dialog.c:138
 #: ../libanjuta/anjuta-preferences-dialog.c:141
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:4 ../src/anjuta.glade.h:16
-#: ../src/anjuta-app.c:652
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4 ../src/anjuta-app.c:657
+#: ../src/preferences.ui.h:12
 msgid "General"
 msgstr "�ั�ว��"
 
@@ -532,7 +533,7 @@ msgstr "�ม�มี�าร�ิ��ามรุ��"
 msgid "Ignored"
 msgstr "ละ�ลย"
 
-#: ../libanjuta/cell-renderer-captioned-image.c:218
+#: ../libanjuta/cell-renderer-captioned-image.c:218 ../src/preferences.ui.h:18
 msgid "Text"
 msgstr "��อ�วาม"
 
@@ -559,78 +560,79 @@ msgstr "�ม���วิ�����: %s"
 msgid "Could not find application pixmap file: %s"
 msgstr "�ม������ม pixmap �อ���ร��รม: %s"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:1
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
 msgid "<b>Build</b>"
 msgstr "<b>�ระ�อ�สร�า�</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:2
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
 msgid "<b>Configuration:</b>"
 msgstr "<b>��า�ั��:</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:3
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
 msgid "<b>Install</b>"
 msgstr "<b>�ิ��ั��</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:4
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
 msgid "<b>Regenerate project</b>"
 msgstr "<b>สร�า���อมูล��ร��าร</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:5
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:5
 msgid "<b>Select Program to run:</b>"
 msgstr "<b>�ลือ���ร��รม�ี��ะ�รีย�:</b>"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:6
-#: ../plugins/run-program/anjuta-run-program.glade.h:1
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
+#: ../plugins/run-program/anjuta-run-program.ui.h:1
 msgid "Arguments:"
 msgstr "อาร��ิว�ม���:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:7
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
 msgid "Build Directory:"
 msgstr "���ร��อรีสำหรั��ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:8
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Configure Options:"
 msgstr "�ัว�ลือ�สำหรั��ั����า:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
 msgid "Configure Project"
 msgstr "�ั����า��ร��าร"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Continue on errors"
 msgstr "�ำ��อ���ึ��ม��ะมี��อ�ิ��ลา�"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
 msgid "Highlight message locations in editor"
 msgstr "�����ำ�ห����ี���ี�ยว�ั���อ�วาม����รื�อ�มือ�����"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
 msgid "Install as root:"
 msgstr "�ิ��ั�����า�ะ�ู��ู�ลระ��:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:13
-#: ../plugins/tools/anjuta-tools.glade.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Run in terminal"
 msgstr "�รีย�����อร�มิ�ัล"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Run several commands at a time:"
 msgstr "�รีย�หลาย�ำสั����า��ั�:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
 msgid "Select Program"
 msgstr "�ลือ���ร��รม"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:16
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "�ลือ����ร��อรีสำหรั��ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade.h:17
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:17
 msgid "Translate messages"
 msgstr "��ล��อ�วาม"
 
 #: ../plugins/build-basic-autotools/configuration-list.c:61
 #: ../plugins/search/search_preferences.c:523
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2 ../src/preferences.ui.h:4
 msgid "Default"
 msgstr "�ริยาย"
 
@@ -647,44 +649,43 @@ msgstr "�ารวั��ระสิ��ิภา�"
 msgid "Optimized"
 msgstr "�รั��ห��หมาะ"
 
-#: ../plugins/build-basic-autotools/executer.c:74
+#: ../plugins/build-basic-autotools/executer.c:73
 msgid "No executables in this project!"
 msgstr "�ม�มี���ม��ร��รม����ร��าร�ี�!"
 
-#: ../plugins/build-basic-autotools/executer.c:152
+#: ../plugins/build-basic-autotools/executer.c:156
 #: ../plugins/gbf-am/gbf-am-project.c:3195
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3087
 msgid "Program"
 msgstr "��ร��รม"
 
-#: ../plugins/build-basic-autotools/executer.c:253
+#: ../plugins/build-basic-autotools/executer.c:257
 msgid "No file or project currently opened."
 msgstr "�ม�มี���มหรือ��ร��าร��ิ�อยู�"
 
 #. Only local program are supported
-#: ../plugins/build-basic-autotools/executer.c:293
+#: ../plugins/build-basic-autotools/executer.c:297
 #: ../plugins/run-program/execute.c:70
 #, c-format
 msgid "Program '%s' is not a local file"
 msgstr "��ร��รม '%s' �ม�������ม����รื�อ�"
 
-#: ../plugins/build-basic-autotools/executer.c:308
-#: ../plugins/scratchbox/plugin.c:213
+#: ../plugins/build-basic-autotools/executer.c:312
 #, c-format
 msgid "Program '%s' does not exists"
 msgstr "��ร��รม '%s' �ม�มีอยู�"
 
-#: ../plugins/build-basic-autotools/executer.c:316
+#: ../plugins/build-basic-autotools/executer.c:320
 #: ../plugins/run-program/execute.c:80
 #, c-format
 msgid "Program '%s' does not have execution permission"
 msgstr "��ร��รม '%s' �ม�����ำห��สิ��ิ��ว��ห��รีย��ำ�า����"
 
-#: ../plugins/build-basic-autotools/executer.c:348
+#: ../plugins/build-basic-autotools/executer.c:352
 msgid "No executable for this file."
 msgstr "�ม�มี���ม��ร��รมสำหรั����ม�ี�"
 
-#: ../plugins/build-basic-autotools/executer.c:354
+#: ../plugins/build-basic-autotools/executer.c:358
 #, c-format
 msgid "Executable '%s' is not up-to-date."
 msgstr "���ม��ร��รม '%s' ยั��ม��รั��าม��อมูลล�าสุ�"
@@ -971,8 +972,8 @@ msgstr "�ำสั���ระ�อ�สร�า�"
 msgid "Build popup commands"
 msgstr "�ำสั���ุ��ึ��สำหรั��ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/plugin.c:3365
-#: ../plugins/build-basic-autotools/plugin.c:3383
+#: ../plugins/build-basic-autotools/plugin.c:3374
+#: ../plugins/build-basic-autotools/plugin.c:3393
 msgid "Build Autotools"
 msgstr "��รื�อ�มืออั���มั�ิสำหรั��ระ�อ�สร�า�"
 
@@ -980,118 +981,136 @@ msgstr "��รื�อ�มืออั���มั�ิสำหรั
 msgid "Command aborted"
 msgstr "�ลิ��ำ�ำสั���ล�ว"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:1
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:1
 msgid "<b>Class Elements</b>"
 msgstr "<b>อ����ระ�อ��อ��ลาส</b>"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:2
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "<b>General Class Properties</b>"
 msgstr "<b>�ุ�สม�ั�ิ�ั�ว���อ��ลาส</b>"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:3
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Project"
 msgstr "��ิ�ม���า����ร��าร"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Add to Repository"
 msgstr "��ิ�ม���า���ลั�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:5
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author Email:"
 msgstr "อี�มล�ู���ีย�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author Name:"
 msgstr "�ื�อ�ู���ีย�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Author/Date-Time"
 msgstr "�ู���ีย�/วั��ี�-�วลา"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Author/Date/Time"
 msgstr "�ู���ีย�/วั��ี�/�วลา"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
 msgid "Base Class Inheritance:"
 msgstr "�ารสื��อ��ลาส�ื���า�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Base Class:"
 msgstr "�ลาส�ื���า�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
 msgid "Class Function Prefix:"
 msgstr "�ำ�ำห��า�ั����ั��ลาส:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:12
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Name:"
 msgstr "�ื�อ�ลาส:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:13
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:13
 msgid "Class Options:"
 msgstr "�ัว�ลือ�สำหรั��ลาส:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:14
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:14
 msgid "Create"
 msgstr "สร�า�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:15
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:15
 msgid "GObject Class\t"
 msgstr "�ลาส GObject\t"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:16
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:16
 msgid "GObject Prefix and Type:"
 msgstr "�ำ�ำห��า�ละ��ิ� GObject:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:17
-msgid ""
-"General Public License (GPL)\n"
-"Lesser General Public License (LGPL)\n"
-"No License"
-msgstr ""
-"สั��าอ�ุ�า�สา�าร�ะ�ั�ว�� (GPL)\n"
-"สั��าอ�ุ�า�สา�าร�ะ�ั�ว�������อ��ร� (LGPL)\n"
-"�ม�มีสั��าอ�ุ�า�"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
+#: ../plugins/file-wizard/file.c:100
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
+msgid "General Public License (GPL)"
+msgstr "สั��าอ�ุ�า�สา�าร�ะ�ั�ว����ู (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
 msgid "Generic C++ Class"
 msgstr "�ลาส��� generic �อ� C++"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:21
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
 msgid "Header File:"
 msgstr "���มส�ว�หัว:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:22
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "Inline the declaration and implementation"
 msgstr "�าร�ระ�าศ�ละ�ัว�ั����ั� inline"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:23
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
+#: ../plugins/file-wizard/file.c:101
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
+msgid "Lesser General Public License (LGPL)"
+msgstr "สั��าอ�ุ�า�สา�าร�ะ�ั�ว�������อ��ร���ู (LGPL)"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
 msgid "License:"
 msgstr "สั��าอ�ุ�า�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:24
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
 msgid "Member Functions/Variables"
 msgstr "�ั����ั�/�ัว��รสมา�ิ�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:25
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
+msgid "No License"
+msgstr "�ม�มีสั��าอ�ุ�า�"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
 #: ../plugins/glade/plugin.c:4436
 msgid "Properties"
 msgstr "�ุ�สม�ั�ิ"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
 msgid "Signals"
 msgstr "สั��า�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
 msgid "Source File:"
 msgstr "���ม�อร�ส:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.glade.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Source/Header Headings:"
 msgstr "ส�ว�����อ����ม�อร�ส/���มส�ว�หัว:"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
+msgid "private"
+msgstr "private"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:30
+msgid "protected"
+msgstr "protected"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:31
+msgid "public"
+msgstr "public"
+
 #: ../plugins/class-gen/generator.c:132
 #, c-format
 msgid "Header or source file has not been created"
@@ -1131,28 +1150,29 @@ msgstr "�รีย� autogen �ม�สำ�ร��: %s"
 msgid "XML description of the user interface"
 msgstr "�ำอ�ิ�าย XML �อ�ส�ว��ิ���อ�ู����"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:1
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
 msgid "<b>CVS Options</b>"
 msgstr "<b>�ัว�ลือ�สำหรั� CVS</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:2
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:2
 msgid "<b>Module Details:</b>"
 msgstr "<b>รายละ�อีย�มอ�ูล:</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:3
-#: ../plugins/git/anjuta-git.glade.h:15
-#: ../plugins/subversion/anjuta-subversion.glade.h:8
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:3
+#: ../plugins/git/anjuta-git.ui.h:17
+#: ../plugins/subversion/anjuta-subversion.ui.h:8
 msgid "<b>Options:</b>"
 msgstr "<b>�ัว�ลือ�:</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:4
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:2
-#: ../plugins/search/anjuta-search.glade.h:3
-#: ../plugins/subversion/anjuta-subversion.glade.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
+#: ../plugins/git/anjuta-git.ui.h:18 ../plugins/search/anjuta-search.ui.h:7
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+#: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "<b>Options</b>"
 msgstr "<b>�ัว�ลือ�</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:5
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
@@ -1165,263 +1185,267 @@ msgstr ""
 "�าร�� \"��ล�\" �ะล����มออ��า��ิส���ละ CVS ����อ�ว�า���ม�ะ�ม��ู�ล�ออ��า� CVS "
 "���ว�า�ุ��ะสั�� CVS Commit <b>�รา��ือ��ุ��ล�ว!</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:8
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "<b>Repository: </b>"
 msgstr "<b>�ลั�: </b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "Be verbose"
 msgstr "�ส����อ�วามอย�า�ละ�อีย�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:10
-#: ../plugins/subversion/anjuta-subversion.glade.h:21
-#: ../plugins/tools/anjuta-tools.glade.h:2
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:22
+#: ../plugins/tools/anjuta-tools.ui.h:2
 msgid "Browse..."
 msgstr "�รีย��ู..."
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS Preferences"
 msgstr "�าร�รั�����สำหรั� CVS"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Add file/directory"
 msgstr "CVS: ��ิ�ม���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Commit file/directory"
 msgstr "CVS: commit ���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Diff file/directory"
 msgstr "CVS: Diff ���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Import"
 msgstr "CVS: �ำ���า"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Log file/directory"
 msgstr "CVS: �ั��ึ��ูม���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVS: Remove file/directory"
 msgstr "CVS: ล����ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
 msgid "CVS: Status"
 msgstr "CVS: ส�า�ะ"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "CVS: Status from file/directory"
 msgstr "CVS: ส�า�ะ�า����ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "CVS: Update file/directory"
 msgstr "CVS: �รั���อมูล���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:21
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
 msgid "CVSROOT:"
 msgstr "CVSROOT:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:22
-#: ../plugins/subversion/anjuta-subversion.glade.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
+#: ../plugins/subversion/anjuta-subversion.ui.h:23
 msgid "Choose file or directory to add:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ��ิ�ม:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to commit:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ commit:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
 msgid "Choose file or directory to diff:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ diff:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:25
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Choose file or directory to get log:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ�ู�ูม:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Choose file or directory to get the status from:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ�ูส�า�ะ:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Choose file or directory to remove:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะล�ออ�:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:28
-#: ../plugins/subversion/anjuta-subversion.glade.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:24
 msgid "Choose file or directory to update:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ�รั���อมูล:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Compression Level (0=off, 10=max):"
 msgstr "ระ�ั��าร�ี� (0=�ม��ี�, 10=สู�สุ�):"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "Create new directories"
 msgstr "สร�า����ร��อรี�หม�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:31
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Delete empty directories"
 msgstr "ล����ร��อรีว�า�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:32
-#: ../plugins/subversion/anjuta-subversion.glade.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/subversion/anjuta-subversion.ui.h:31
 msgid "Do not act recursively"
 msgstr "�ม��ำ�����ร��อรีย�อย"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+msgid "Extern (rsh)"
+msgstr "ภาย�อ� (rsh)"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
 msgid "File is binary"
 msgstr "���ม�������ารี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:34
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "�ม�ส������ม .cvsrc (��ะ�ำ)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:35
-msgid ""
-"Local\n"
-"Extern (rsh)\n"
-"Password server (pserver)\n"
-msgstr ""
-"����รื�อ�\n"
-"ภาย�อ� (rsh)\n"
-"��ิร���วอร�รหัส��า� (pserver)\n"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
+#: ../plugins/symbol-db/plugin.c:2228
+msgid "Local"
+msgstr "���าะ�ี�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
 msgid "Log message:"
 msgstr "��อ�วาม�ูม:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:40
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
 msgid "Module name:"
 msgstr "�ื�อมอ�ูล:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:41
-#: ../plugins/subversion/anjuta-subversion.glade.h:36
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+msgid "Password server (pserver)"
+msgstr "��ิร���วอร�รหัส��า� (pserver)"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Password:"
 msgstr "รหัส��า�:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
+msgid "Patch-Style diff"
+msgstr "diff ��������"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Path to \"cvs\" command"
 msgstr "�า��ำสั�� \"cvs\""
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Project root directory:"
 msgstr "���ร��อรีรา��อ���ร��าร:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
 msgid "Release tag:"
 msgstr "�����ารออ�รุ��:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:45
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "ล�า���า���� sticky"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:46
-#: ../plugins/git/anjuta-git.glade.h:78
-#: ../plugins/subversion/anjuta-subversion.glade.h:46
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:87
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
 msgid "Revision:"
 msgstr "��ั������:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:47
-msgid ""
-"Standard diff\n"
-"Patch-Style diff"
-msgstr ""
-"diff มา�ร�า�\n"
-"diff ��������"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:47
+msgid "Standard diff"
+msgstr "diff มา�ร�า�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:49
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:48
 msgid "Unified format instead of context format"
 msgstr "���รู���� unified ���รู���� context"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:50
-#: ../plugins/subversion/anjuta-subversion.glade.h:55
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "Use revision/tag:"
 msgstr "�����ั������/����:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:51
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:50
 msgid "Use revision:"
 msgstr "�����ั������:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:52
-#: ../plugins/subversion/anjuta-subversion.glade.h:56
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
 msgid "Username:"
 msgstr "�ื�อ�ู����:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:53
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:52
 msgid "Vendor tag:"
 msgstr "�����อ��ู��ั����:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.glade.h:54
-#: ../plugins/git/anjuta-git.glade.h:92
-#: ../plugins/subversion/anjuta-subversion.glade.h:60
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:104
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
 msgid "Whole project"
 msgstr "�ั����ร��าร"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:47
+#: ../plugins/cvs-plugin/cvs-callbacks.c:46
 msgid "Please enter a filename!"
 msgstr "�รุ�า��อ��ื�อ���ม!"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:60
+#: ../plugins/cvs-plugin/cvs-callbacks.c:59
 #, c-format
 msgid "Please fill field: %s"
 msgstr "�รุ�า�รอ���อ�: %s"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:79
+#: ../plugins/cvs-plugin/cvs-callbacks.c:78
 msgid "CVS command is running! Please wait until it is finished!"
 msgstr "�ำสั�� CVS �ำลั��ำ�า�! �รุ�ารอ�ห��ำ�า��สร����อ�!"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:153
+#: ../plugins/cvs-plugin/cvs-callbacks.c:152
 msgid "Unable to delete file"
 msgstr "ล����ม�ม����"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:245
-#: ../plugins/git/git-commit-dialog.c:74
-#: ../plugins/git/git-create-tag-dialog.c:127
-#: ../plugins/git/git-merge-dialog.c:80
-#: ../plugins/subversion/subversion-commit-dialog.c:70
+#: ../plugins/cvs-plugin/cvs-callbacks.c:244
+#: ../plugins/git/git-commit-dialog.c:79
+#: ../plugins/git/git-create-tag-dialog.c:130
+#: ../plugins/git/git-merge-dialog.c:87
+#: ../plugins/subversion/subversion-commit-dialog.c:88
 msgid "Are you sure that you want to pass an empty log message?"
 msgstr "ยื�ยั�ว�า��อ��ารส����อ�วาม�ูม�ี�ว�า���ล�าหรือ�ม�?"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:436
+#: ../plugins/cvs-plugin/cvs-callbacks.c:435
 msgid "CVSROOT"
 msgstr "CVSROOT"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:439
-#: ../plugins/gbf-am/gbf-am-properties.c:1227
+#: ../plugins/cvs-plugin/cvs-callbacks.c:438
+#: ../plugins/gbf-am/gbf-am-properties.c:1234
 msgid "Module"
 msgstr "มอ�ูล"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:442
+#: ../plugins/cvs-plugin/cvs-callbacks.c:441
 msgid "Vendor"
 msgstr "�ู��ำห��าย"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:445
+#: ../plugins/cvs-plugin/cvs-callbacks.c:444
 msgid "Release"
 msgstr "รีลีส"
 
-#: ../plugins/cvs-plugin/cvs-callbacks.c:461
+#: ../plugins/cvs-plugin/cvs-callbacks.c:460
 msgid "Are you sure that you do not want a log message?"
 msgstr "ยื�ยั�ว�า�ม���อ��าร�ั��ึ��ูม��อ�วาม����หม?"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:126
+#: ../plugins/cvs-plugin/cvs-execute.c:125
 msgid "CVS command failed - See above for details"
 msgstr "�ำสั�� CVS ล�ม�หลว - �ูรายละ�อีย���า���"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:131
+#: ../plugins/cvs-plugin/cvs-execute.c:130
 #, c-format
 msgid "CVS command successful! - Time taken: %ld second"
 msgid_plural "CVS command successful! - Time taken: %ld seconds"
 msgstr[0] "�ำสั�� CVS �ำ�า��สร��! - ����วลา: %ld วิ�า�ี"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:222
+#: ../plugins/cvs-plugin/cvs-execute.c:221
 msgid "CVS command is running - please wait until it finishes!"
 msgstr "�ำสั�� CVS �ำลั��ำ�า� - �รุ�ารอ���ว�า�ะ�สร��!"
 
-#: ../plugins/cvs-plugin/cvs-execute.c:230
-#: ../plugins/cvs-plugin/cvs-execute.c:234 ../plugins/cvs-plugin/plugin.c:462
-#: ../plugins/cvs-plugin/plugin.c:469
+#: ../plugins/cvs-plugin/cvs-execute.c:229
+#: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
+#: ../plugins/cvs-plugin/plugin.c:474 ../plugins/search/anjuta-search.ui.h:13
 msgid "CVS"
 msgstr "CVS"
 
@@ -1470,7 +1494,7 @@ msgstr "Commit �าร��ลี�ย���ล��อ��ุ��
 #. Action name
 #. Stock icon, if any
 #: ../plugins/cvs-plugin/plugin.c:76 ../plugins/cvs-plugin/plugin.c:135
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:50
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:49
 #: ../plugins/gdb/anjuta-gdb.glade.h:38
 msgid "_Update"
 msgstr "_�รั���อมูล"
@@ -1537,386 +1561,385 @@ msgstr "�าร�ระ�ำ��ี�ยว�ั� CVS"
 msgid "CVS popup operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั� CVS ���ม�ู�ุ��ึ��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:1
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
 msgid "<b>Debugger:</b>"
 msgstr "<b>��ร��รม�ี�ั��:</b>"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:2
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:2
 msgid "<b>Remote debugging</b>"
 msgstr "<b>�าร�ี�ั����า���รือ��าย</b>"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:3
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:3
 msgid "Add Watch"
 msgstr "��ิ�ม�าร���า�ู"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:4
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Address:"
 msgstr "�อ���รส:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:5
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
 #: ../plugins/gdb/anjuta-gdb.glade.h:2
 msgid "Attach to process"
 msgstr "����ั���ร��ส"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:6
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 #: ../plugins/gdb/anjuta-gdb.glade.h:3
 msgid "Breakpoint properties"
 msgstr "�ุ�สม�ั�ิ�ุ��ั�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:7
-#: ../plugins/debug-manager/breakpoints.c:1977
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
+#: ../plugins/debug-manager/breakpoints.c:1981
 #: ../plugins/gdb/anjuta-gdb.glade.h:4
 msgid "Breakpoints"
 msgstr "�ุ��ั�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
 #: ../plugins/gdb/anjuta-gdb.glade.h:5
 msgid "CPU Registers"
 msgstr "�ร�ิส��อร��อ� CPU"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "Change Watch"
 msgstr "��ลี�ย��าร���า�ู"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
 msgid "Connect to remote target"
 msgstr "��ื�อม��อ��ยั����าหมาย����รือ��าย"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 #: ../plugins/gdb/anjuta-gdb.glade.h:7
 msgid "Debugger command"
 msgstr "�ำสั����ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:12
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 #: ../plugins/gdb/anjuta-gdb.glade.h:8
 msgid "Debugger command:"
 msgstr "�ำสั����ร��รม�ี�ั��:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:13
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 #: ../plugins/gdb/anjuta-gdb.glade.h:9
 #: ../plugins/project-wizard/templates/translatable-strings.h:32
 msgid "Description:"
 msgstr "�ำอ�ิ�าย:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
 msgid "Disable"
 msgstr "�ิ�����า�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
 #: ../plugins/gdb/anjuta-gdb.glade.h:10
 msgid "Display process _tree"
 msgstr "�ส��_ลำ�ั��ั���อ���ร��ส"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:16
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 #: ../plugins/gdb/anjuta-gdb.glade.h:11
 msgid "Enable _all"
 msgstr "��ิ�����า�_�ั��หม�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "��อ��อ���รส�����ล��า�สิ�ห�หรือ�ลือ��า���อมูล"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 #: ../plugins/gdb/anjuta-gdb.glade.h:14
 msgid "Hide process para_meters"
 msgstr "��อ��ารา_มิ��อร���ร��ส"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 #: ../plugins/gdb/anjuta-gdb.glade.h:15
 msgid "Inspect"
 msgstr "�รว�สอ�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Inspect/Evaluate"
 msgstr "�รว�สอ�/�ระมวล�ล"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:21
-#: ../plugins/debug-manager/plugin.c:926
-#: ../plugins/debug-manager/plugin.c:1026 ../plugins/gdb/anjuta-gdb.glade.h:16
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
+#: ../plugins/debug-manager/plugin.c:931
+#: ../plugins/debug-manager/plugin.c:1031 ../plugins/gdb/anjuta-gdb.glade.h:16
 msgid "Kernel Signals"
 msgstr "สั��า���อร���ล"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:22
-#: ../plugins/debug-manager/breakpoints.c:1904
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
+#: ../plugins/debug-manager/breakpoints.c:1908
 #: ../plugins/gdb/anjuta-gdb.glade.h:17
 msgid "Location"
 msgstr "�ำ�ห���"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:23
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 #: ../plugins/debug-manager/memory.c:180 ../plugins/gdb/anjuta-gdb.glade.h:18
 msgid "Memory"
 msgstr "ห��วย�วาม�ำ"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:24
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
 #: ../plugins/gdb/anjuta-gdb.glade.h:19
 msgid "Pass:"
 msgstr "��า�:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
 msgid "Port:"
 msgstr "�อร��:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:26
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
 #: ../plugins/gdb/anjuta-gdb.glade.h:20
 msgid "Print:"
 msgstr "�ิม��:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:27
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
 #: ../plugins/gdb/anjuta-gdb.glade.h:21
 msgid "Program Interrupt"
 msgstr "�ั��ั�หวะ��ร��รม"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:28
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 #: ../plugins/gdb/anjuta-gdb.glade.h:23
 msgid "SIGINT"
 msgstr "SIGINT"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Select one directory"
 msgstr "�ลือ����ร��อรี"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
 msgid "Serial Line Connection"
 msgstr "�าร��ื�อม��อสายอ�ุ�รม"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:31
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
 #: ../plugins/gdb/anjuta-gdb.glade.h:24
 msgid "Set Signal Property"
 msgstr "�ั����า�ุ�สม�ั�ิ�อ�สั��า�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:32
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
 #: ../plugins/debug-manager/sharedlib.c:214
 #: ../plugins/gdb/anjuta-gdb.glade.h:25
 msgid "Shared libraries"
 msgstr "�ล�ารี���ร�วม"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:33
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:33
 #: ../plugins/gdb/anjuta-gdb.glade.h:26
 msgid "Signal:"
 msgstr "สั��า�:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:34
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:34
 #: ../plugins/gdb/anjuta-gdb.glade.h:27
 msgid "Source Directories"
 msgstr "���ร��อรี�อร�ส"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:35
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:35
 msgid "Start Debugger"
 msgstr "�รีย���ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:36
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:36
 #: ../plugins/gdb/anjuta-gdb.glade.h:28
 msgid "Stop:"
 msgstr "หยุ�:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:37
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:37
 msgid "TCP/IP Connection"
 msgstr "�าร��ื�อม��อ TCP/IP"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:38
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:38
 #: ../plugins/gdb/anjuta-gdb.glade.h:29
 #: ../plugins/project-wizard/property.c:287
 msgid "Yes"
 msgstr "���"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:39
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:39
 #: ../plugins/gdb/anjuta-gdb.glade.h:30
 msgid "_Attach"
 msgstr "�_��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:40
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:40
 msgid "_Automatic update"
 msgstr "_�รั���อมูลอั���มั�ิ"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:41
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:41
 #: ../plugins/gdb/anjuta-gdb.glade.h:31
 msgid "_Condition:"
 msgstr "�_�ื�อ���:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:42
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
 #: ../plugins/gdb/anjuta-gdb.glade.h:32
 msgid "_Disable all"
 msgstr "�ิ_�����า��ั��หม�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:43
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:43
 #: ../plugins/gdb/anjuta-gdb.glade.h:33
 msgid "_Hide paths"
 msgstr "_��อ��า�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:44
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:44
 #: ../plugins/gdb/anjuta-gdb.glade.h:34
 msgid "_Location:"
 msgstr "_�ำ�ห���:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:45
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:45
 msgid "_Name:"
 msgstr "_�ื�อ:"
 
-#. This is the number of time that the program executes the line where a breakpoint is located. It is used as a list header, so I have tried to find a quite short name.
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:47
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:46
 msgid "_Pass count:"
 msgstr "_�ำ�ว��รั���ี���า�:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:48
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:47
 #: ../plugins/gdb/anjuta-gdb.glade.h:36
 msgid "_Process to attach to:"
 msgstr "�_�ร��ส�ี��ะ������า:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:49
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:48
 #: ../plugins/gdb/anjuta-gdb.glade.h:37
 msgid "_Remove all"
 msgstr "_�อาออ��ั��หม�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.glade.h:51
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:50
 msgid "_Value:"
 msgstr "_��า:"
 
-#: ../plugins/debug-manager/breakpoints.c:1670
+#: ../plugins/debug-manager/breakpoints.c:1674
 msgid "Are you sure you want to delete all the breakpoints?"
 msgstr "ยื�ยั�ว�า��อ��ารล��ุ��ั��ั��หม�หรือ�ม�?"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1767
+#: ../plugins/debug-manager/breakpoints.c:1771
 msgid "_Breakpoints"
 msgstr "�ุ�_�ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1775
+#: ../plugins/debug-manager/breakpoints.c:1779
 msgid "Toggle Breakpoint"
 msgstr "สลั��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1777
+#: ../plugins/debug-manager/breakpoints.c:1781
 msgid "Toggle breakpoint at the current location"
 msgstr "สลั��ุ��ั��ี��ำ�ห����ั��ุ�ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1783
+#: ../plugins/debug-manager/breakpoints.c:1787
 msgid "Add Breakpoint..."
 msgstr "��ิ�ม�ุ��ั�..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1785
+#: ../plugins/debug-manager/breakpoints.c:1789
 msgid "Add a breakpoint"
 msgstr "��ิ�ม�ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1791
+#: ../plugins/debug-manager/breakpoints.c:1795
 msgid "Remove Breakpoint"
 msgstr "ล��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1793
+#: ../plugins/debug-manager/breakpoints.c:1797
 msgid "Remove a breakpoint"
 msgstr "ล��ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1799
+#: ../plugins/debug-manager/breakpoints.c:1803
 msgid "Edit Breakpoint"
 msgstr "������ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1801
+#: ../plugins/debug-manager/breakpoints.c:1805
 msgid "Edit breakpoint properties"
 msgstr "������ุ�สม�ั�ิ�ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1807
-#: ../plugins/debug-manager/breakpoints.c:1878
+#: ../plugins/debug-manager/breakpoints.c:1811
+#: ../plugins/debug-manager/breakpoints.c:1882
 msgid "Enable Breakpoint"
 msgstr "��ิ�����า��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1809
-#: ../plugins/debug-manager/breakpoints.c:1879
+#: ../plugins/debug-manager/breakpoints.c:1813
+#: ../plugins/debug-manager/breakpoints.c:1883
 msgid "Enable a breakpoint"
 msgstr "��ิ�����า��ุ��ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1815
+#: ../plugins/debug-manager/breakpoints.c:1819
 msgid "Disable All Breakpoints"
 msgstr "�ิ��าร����า��ุ��ั��ั��หม�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1817
+#: ../plugins/debug-manager/breakpoints.c:1821
 msgid "Deactivate all breakpoints"
 msgstr "�ิ��าร�ำ�า��ุ��ั��ั��หม�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1823
+#: ../plugins/debug-manager/breakpoints.c:1827
 msgid "R_emove All Breakpoints"
 msgstr "_ล��ุ��ั��ั��หม�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1825
+#: ../plugins/debug-manager/breakpoints.c:1829
 msgid "Remove all breakpoints"
 msgstr "ล��ุ��ั��ั��หม�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/breakpoints.c:1834
+#: ../plugins/debug-manager/breakpoints.c:1838
 msgid "Jump to Breakpoint"
 msgstr "�ระ������ี��ุ��ั�"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/breakpoints.c:1836
+#: ../plugins/debug-manager/breakpoints.c:1840
 msgid "Jump to breakpoint location"
 msgstr "�ระ������ี��ำ�ห����ุ��ั�"
 
-#: ../plugins/debug-manager/breakpoints.c:1873
+#: ../plugins/debug-manager/breakpoints.c:1877
 msgid "Disable Breakpoint"
 msgstr "�ิ��าร����า��ุ��ั�"
 
-#: ../plugins/debug-manager/breakpoints.c:1874
+#: ../plugins/debug-manager/breakpoints.c:1878
 msgid "Disable a breakpoint"
 msgstr "หยุ��ำ�า��ุ��ั�"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
-#: ../plugins/tools/anjuta-tools.glade.h:6
+#: ../plugins/debug-manager/breakpoints.c:1908
+#: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Enabled"
 msgstr "��ิ�����า�"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
+#: ../plugins/debug-manager/breakpoints.c:1908
 #: ../plugins/debug-manager/stack_trace.c:667
 #: ../plugins/debug-manager/threads.c:481
 msgid "Address"
 msgstr "�อ���รส"
 
-#: ../plugins/debug-manager/breakpoints.c:1904
+#: ../plugins/debug-manager/breakpoints.c:1908
 #: ../plugins/debug-manager/debug_tree.c:126
 msgid "Type"
 msgstr "��ิ�"
 
-#: ../plugins/debug-manager/breakpoints.c:1905
+#: ../plugins/debug-manager/breakpoints.c:1909
 msgid "Condition"
 msgstr "��ื�อ���"
 
-#: ../plugins/debug-manager/breakpoints.c:1905
+#: ../plugins/debug-manager/breakpoints.c:1909
 msgid "Pass count"
 msgstr "�ำ�ว��รั���ี���า�"
 
-#: ../plugins/debug-manager/breakpoints.c:1905
+#: ../plugins/debug-manager/breakpoints.c:1909
 msgid "State"
 msgstr "ส�า�ะ"
 
-#: ../plugins/debug-manager/breakpoints.c:1954
-#: ../plugins/debug-manager/breakpoints.c:1960
+#: ../plugins/debug-manager/breakpoints.c:1958
+#: ../plugins/debug-manager/breakpoints.c:1964
 msgid "Breakpoint operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��ุ��ั�"
 
@@ -1927,14 +1950,14 @@ msgid "_Goto address"
 msgstr "�_�ยั��อ���รส"
 
 #: ../plugins/debug-manager/debug_tree.c:126
-#: ../plugins/gbf-am/gbf-am-properties.c:964 ../plugins/tools/editor.c:461
+#: ../plugins/gbf-am/gbf-am-properties.c:971 ../plugins/tools/editor.c:463
 msgid "Variable"
 msgstr "�ัว��ร"
 
 #: ../plugins/debug-manager/debug_tree.c:126
 #: ../plugins/debug-manager/registers.c:469
-#: ../plugins/gbf-am/gbf-am-properties.c:974
-#: ../plugins/run-program/parameters.c:741 ../plugins/tools/editor.c:467
+#: ../plugins/gbf-am/gbf-am-properties.c:981
+#: ../plugins/run-program/parameters.c:745 ../plugins/tools/editor.c:469
 msgid "Value"
 msgstr "��า"
 
@@ -1999,193 +2022,193 @@ msgstr "��ร��รม���รั�สั��า�: %s\n"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:810
+#: ../plugins/debug-manager/plugin.c:815
 msgid "_Debug"
 msgstr "_�ี�ั��"
 
-#: ../plugins/debug-manager/plugin.c:818
+#: ../plugins/debug-manager/plugin.c:823
 msgid "_Start Debugger"
 msgstr "�_รีย���ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/plugin.c:826
+#: ../plugins/debug-manager/plugin.c:831
 msgid "_Debug Program"
 msgstr "_�ี�ั����ร��รม"
 
-#: ../plugins/debug-manager/plugin.c:828
+#: ../plugins/debug-manager/plugin.c:833
 msgid "Start debugger and load the program"
 msgstr "�รีย���ร��รม�ี�ั���ร�อม�หล���ร��รม"
 
-#: ../plugins/debug-manager/plugin.c:834
+#: ../plugins/debug-manager/plugin.c:839
 msgid "_Debug Process..."
 msgstr "�ี�ั���_�ร��ส..."
 
-#: ../plugins/debug-manager/plugin.c:836
+#: ../plugins/debug-manager/plugin.c:841
 msgid "Start debugger and attach to a running program"
 msgstr "�ริ�ม��ร��รม�ี�ั���ละ����ั���ร��รม�ี��ำลั��ำ�า�"
 
-#: ../plugins/debug-manager/plugin.c:842
+#: ../plugins/debug-manager/plugin.c:847
 msgid "Debug _Remote Target..."
 msgstr "�ี�ั�����าหมาย���_�รือ��าย..."
 
-#: ../plugins/debug-manager/plugin.c:844
+#: ../plugins/debug-manager/plugin.c:849
 msgid "Connect to a remote debugging target"
 msgstr "��ื�อม��อ��ยั����าหมาย�าร�ี�ั������รือ��าย"
 
-#: ../plugins/debug-manager/plugin.c:850
+#: ../plugins/debug-manager/plugin.c:855
 msgid "Stop Debugger"
 msgstr "หยุ���ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/plugin.c:852
+#: ../plugins/debug-manager/plugin.c:857
 msgid "Say goodbye to the debugger"
 msgstr "�อ�ลา��ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/plugin.c:858
+#: ../plugins/debug-manager/plugin.c:863
 msgid "Add source paths..."
 msgstr "��ิ�ม�า��อ��อร�ส..."
 
-#: ../plugins/debug-manager/plugin.c:860
+#: ../plugins/debug-manager/plugin.c:865
 msgid "Add additional source paths"
 msgstr "��ิ�ม�า��อ��อร�ส"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:870 ../plugins/debug-manager/plugin.c:978
+#: ../plugins/debug-manager/plugin.c:875 ../plugins/debug-manager/plugin.c:983
 msgid "Debugger Command..."
 msgstr "�ำสั����ร��รม�ี�ั��..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:872 ../plugins/debug-manager/plugin.c:980
+#: ../plugins/debug-manager/plugin.c:877 ../plugins/debug-manager/plugin.c:985
 msgid "Custom debugger command"
 msgstr "�ำสั����ร��รม�ี�ั������ำห���อ�"
 
-#: ../plugins/debug-manager/plugin.c:878 ../plugins/debug-manager/plugin.c:986
+#: ../plugins/debug-manager/plugin.c:883 ../plugins/debug-manager/plugin.c:991
 msgid "_Info"
 msgstr "_��อมูล"
 
-#: ../plugins/debug-manager/plugin.c:886
+#: ../plugins/debug-manager/plugin.c:891
 msgid "Info _Target Files"
 msgstr "��อมูล���ม�ลาย_�า�"
 
-#: ../plugins/debug-manager/plugin.c:888
+#: ../plugins/debug-manager/plugin.c:893
 msgid "Display information on the files the debugger is active with"
 msgstr "�ส����อมูล�อ����ม�ี���ร��รม�ี�ั���ำลั��ำ�า���วย"
 
-#: ../plugins/debug-manager/plugin.c:894
+#: ../plugins/debug-manager/plugin.c:899
 msgid "Info _Program"
 msgstr "��อมูล�_�ร��รม"
 
-#: ../plugins/debug-manager/plugin.c:896
+#: ../plugins/debug-manager/plugin.c:901
 msgid "Display information on the execution status of the program"
 msgstr "�ส����อมูล�อ�ส�า�ะ�าร�ำ�า��อ���ร��รม"
 
-#: ../plugins/debug-manager/plugin.c:902
+#: ../plugins/debug-manager/plugin.c:907
 msgid "Info _Kernel User Struct"
 msgstr "��อมูล User Struct �อ��_�อร���ล"
 
-#: ../plugins/debug-manager/plugin.c:904
+#: ../plugins/debug-manager/plugin.c:909
 msgid "Display the contents of kernel 'struct user' for current child"
 msgstr "�ส����ื�อหา�อ� 'struct user' �อ���อร���ลสำหรั���ร��สลู��ั��ุ�ั�"
 
-#: ../plugins/debug-manager/plugin.c:918
-#: ../plugins/debug-manager/plugin.c:1018
+#: ../plugins/debug-manager/plugin.c:923
+#: ../plugins/debug-manager/plugin.c:1023
 msgid "Shared Libraries"
 msgstr "�ล�ารี���ร�วม"
 
-#: ../plugins/debug-manager/plugin.c:920
-#: ../plugins/debug-manager/plugin.c:1020
+#: ../plugins/debug-manager/plugin.c:925
+#: ../plugins/debug-manager/plugin.c:1025
 msgid "Show shared libraries mappings"
 msgstr "�ส���ั��าร����ล�ารี���ร�วม"
 
-#: ../plugins/debug-manager/plugin.c:928
-#: ../plugins/debug-manager/plugin.c:1028
+#: ../plugins/debug-manager/plugin.c:933
+#: ../plugins/debug-manager/plugin.c:1033
 msgid "Show kernel signals"
 msgstr "�ส��สั��า���อร���ล"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:938
+#: ../plugins/debug-manager/plugin.c:943
 msgid "Run/_Continue"
 msgstr "�รีย��ำ�า�/_�ำ��อ��"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:940
+#: ../plugins/debug-manager/plugin.c:945
 msgid "Continue the execution of the program"
 msgstr "�ห���ร��รม�ำ�า���อ��"
 
-#: ../plugins/debug-manager/plugin.c:946
+#: ../plugins/debug-manager/plugin.c:951
 msgid "Step _In"
 msgstr "��าว�_��า"
 
-#: ../plugins/debug-manager/plugin.c:948
+#: ../plugins/debug-manager/plugin.c:953
 msgid "Single step into function"
 msgstr "�ำห�ึ���ั�����า���ั����ั�"
 
-#: ../plugins/debug-manager/plugin.c:954
+#: ../plugins/debug-manager/plugin.c:959
 msgid "Step O_ver"
 msgstr "��าว��า_ม"
 
-#: ../plugins/debug-manager/plugin.c:956
+#: ../plugins/debug-manager/plugin.c:961
 msgid "Single step over function"
 msgstr "�ำห�ึ���ั����าม�ั����ั�"
 
-#: ../plugins/debug-manager/plugin.c:962
+#: ../plugins/debug-manager/plugin.c:967
 msgid "Step _Out"
 msgstr "��าว_ออ�"
 
-#: ../plugins/debug-manager/plugin.c:964
+#: ../plugins/debug-manager/plugin.c:969
 msgid "Single step out of the function"
 msgstr "�ำห�ึ���ั��ออ��า��ั����ั�"
 
-#: ../plugins/debug-manager/plugin.c:970
+#: ../plugins/debug-manager/plugin.c:975
 msgid "_Run to Cursor"
 msgstr "_�ำ�ึ���อร���อร�"
 
-#: ../plugins/debug-manager/plugin.c:972
+#: ../plugins/debug-manager/plugin.c:977
 msgid "Run to the cursor"
 msgstr "�ำ���ึ���อร���อร�"
 
-#: ../plugins/debug-manager/plugin.c:994
+#: ../plugins/debug-manager/plugin.c:999
 msgid "Info _Global Variables"
 msgstr "��อมูล�ัว��ร�_�ล�อล"
 
-#: ../plugins/debug-manager/plugin.c:996
+#: ../plugins/debug-manager/plugin.c:1001
 msgid "Display all global and static variables of the program"
 msgstr "�ส���ัว��ร��ล�อล�ละส���ิ��ั��หม��อ���ร��รม"
 
-#: ../plugins/debug-manager/plugin.c:1002
+#: ../plugins/debug-manager/plugin.c:1007
 msgid "Info _Current Frame"
 msgstr "��อมูล��รม_�ั��ุ�ั�"
 
-#: ../plugins/debug-manager/plugin.c:1004
+#: ../plugins/debug-manager/plugin.c:1009
 msgid "Display information about the current frame of execution"
 msgstr "�ส����อมูล��ี�ยว�ั���รม�ั��ุ�ั��อ��าร�ำ�า�"
 
-#: ../plugins/debug-manager/plugin.c:1010
+#: ../plugins/debug-manager/plugin.c:1015
 msgid "Info Function _Arguments"
 msgstr "��อมูล_อาร��ิว�ม����ั����ั�"
 
-#: ../plugins/debug-manager/plugin.c:1012
+#: ../plugins/debug-manager/plugin.c:1017
 msgid "Display function arguments of the current frame"
 msgstr "�ส��อาร��ิว�ม����อ��ั����ั��อ���รม�ั��ุ�ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/plugin.c:1038
+#: ../plugins/debug-manager/plugin.c:1043
 msgid "Pa_use Program"
 msgstr "_�ั���ร��รม"
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/plugin.c:1040
+#: ../plugins/debug-manager/plugin.c:1045
 msgid "Pauses the execution of the program"
 msgstr "หยุ��ั��าร�ำ�า��อ���ร��รม"
 
-#: ../plugins/debug-manager/plugin.c:1080
-#: ../plugins/debug-manager/plugin.c:1086
-#: ../plugins/debug-manager/plugin.c:1092
-#: ../plugins/debug-manager/plugin.c:1098
+#: ../plugins/debug-manager/plugin.c:1085
+#: ../plugins/debug-manager/plugin.c:1091
+#: ../plugins/debug-manager/plugin.c:1097
+#: ../plugins/debug-manager/plugin.c:1103
 msgid "Debugger operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���ร��รม�ี�ั��"
 
@@ -2212,13 +2235,11 @@ msgstr "�รั���อมูล"
 msgid "Shared Object"
 msgstr "อ�อ���������ร�วม"
 
-#: ../plugins/debug-manager/sharedlib.c:173
-#: ../plugins/git/anjuta-git.glade.h:58
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:66
 msgid "From"
 msgstr "�า�"
 
-#: ../plugins/debug-manager/sharedlib.c:180
-#: ../plugins/git/anjuta-git.glade.h:86
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:98
 msgid "To"
 msgstr "�ึ�"
 
@@ -2304,7 +2325,7 @@ msgstr "��รม"
 #. Register actions
 #: ../plugins/debug-manager/stack_trace.c:631
 #: ../plugins/debug-manager/threads.c:451 ../plugins/tools/tool.c:100
-#: ../src/anjuta-app.c:422
+#: ../src/anjuta-app.c:419
 #: ../plugins/file-wizard/anjuta-file-wizard.plugin.in.h:2
 msgid "File"
 msgstr "���ม"
@@ -2332,53 +2353,53 @@ msgstr "ส����"
 msgid "Stack frame operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���รม�อ�ส����"
 
-#: ../plugins/debug-manager/start.c:97
+#: ../plugins/debug-manager/start.c:96
 msgid "Pid"
 msgstr "Pid"
 
-#: ../plugins/debug-manager/start.c:97
+#: ../plugins/debug-manager/start.c:96
 msgid "User"
 msgstr "�ู����"
 
-#: ../plugins/debug-manager/start.c:97
+#: ../plugins/debug-manager/start.c:96
 msgid "Time"
 msgstr "�วลา"
 
-#: ../plugins/debug-manager/start.c:97
+#: ../plugins/debug-manager/start.c:96
 msgid "Command"
 msgstr "�ำสั��"
 
-#: ../plugins/debug-manager/start.c:621
+#: ../plugins/debug-manager/start.c:620
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "�ม�สามาร��รีย��ำ�า�: %s"
 
-#: ../plugins/debug-manager/start.c:635
+#: ../plugins/debug-manager/start.c:634
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "�ม�สามาร���ิ����ม: %s\n"
 
-#: ../plugins/debug-manager/start.c:913
+#: ../plugins/debug-manager/start.c:918
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "�ม�สามาร���ิ� %s �ม�สามาร��ริ�ม��ร��รม�ี�ั�����"
 
-#: ../plugins/debug-manager/start.c:923
+#: ../plugins/debug-manager/start.c:928
 #, c-format
 msgid "Unable to detect mime-type of %s. Debugger cannot start."
 msgstr "�ม�สามาร��รว�หา��ิ� mime �อ� %s ��� �ม�สามาร��ริ�ม��ร��รม�ี�ั�����"
 
-#: ../plugins/debug-manager/start.c:1059 ../plugins/debug-manager/start.c:1251
-#: ../plugins/run-program/parameters.c:600
+#: ../plugins/debug-manager/start.c:1065 ../plugins/debug-manager/start.c:1260
+#: ../plugins/run-program/parameters.c:603
 #, c-format
 msgid "Missing file %s"
 msgstr "�า����ม %s"
 
-#: ../plugins/debug-manager/start.c:1272
+#: ../plugins/debug-manager/start.c:1282
 msgid "Path"
 msgstr "�า�"
 
-#: ../plugins/debug-manager/start.c:1320 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1330 ../plugins/gdb/debugger.c:1699
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2406,51 +2427,51 @@ msgstr "�าร�ระ�ำ��ี�ยว�ั���ร�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:378
+#: ../plugins/debug-manager/watch.c:390
 msgid "Ins_pect/Evaluate..."
 msgstr "�รว�_สอ�/�ระมวล�ล..."
 
 #. Display label
 #. short-cut
-#: ../plugins/debug-manager/watch.c:380
+#: ../plugins/debug-manager/watch.c:392
 msgid "Inspect or evaluate an expression or variable"
 msgstr "�รว�สอ�หรือ�ระมวล�ล�ิ����หรือ�ัว��ร"
 
-#: ../plugins/debug-manager/watch.c:386
+#: ../plugins/debug-manager/watch.c:398
 msgid "Add Watch..."
 msgstr "��ิ�ม�าร���า�ู..."
 
-#: ../plugins/debug-manager/watch.c:394
+#: ../plugins/debug-manager/watch.c:406
 msgid "Remove Watch"
 msgstr "ล��าร���า�ู"
 
-#: ../plugins/debug-manager/watch.c:402
+#: ../plugins/debug-manager/watch.c:414
 msgid "Update Watch"
 msgstr "�รั���อมูล�าร���า�ู"
 
-#: ../plugins/debug-manager/watch.c:410
+#: ../plugins/debug-manager/watch.c:422
 msgid "Change Value"
 msgstr "��ลี�ย���า"
 
-#: ../plugins/debug-manager/watch.c:418
+#: ../plugins/debug-manager/watch.c:430
 msgid "Update all"
 msgstr "�รั���อมูล�ั��หม�"
 
-#: ../plugins/debug-manager/watch.c:426
+#: ../plugins/debug-manager/watch.c:438
 msgid "Remove all"
 msgstr "ล��ั��หม�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/debug-manager/watch.c:437
+#: ../plugins/debug-manager/watch.c:449
 msgid "Automatic update"
 msgstr "�รั���อมูลอั���มั�ิ"
 
-#: ../plugins/debug-manager/watch.c:463 ../plugins/debug-manager/watch.c:469
+#: ../plugins/debug-manager/watch.c:475 ../plugins/debug-manager/watch.c:481
 msgid "Watch operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��าร���า�ู"
 
-#: ../plugins/debug-manager/watch.c:541
+#: ../plugins/debug-manager/watch.c:553
 msgid "Watches"
 msgstr "���า�ู"
 
@@ -2499,15 +2520,15 @@ msgstr "ออ��ล��"
 msgid "Contents"
 msgstr "��ื�อหา"
 
-#: ../plugins/devhelp/plugin.c:398 ../plugins/search/search-replace.c:1035
-#: ../plugins/search/search-replace.c:1708
-#: ../plugins/search/search-replace.c:1715
-#: ../plugins/search/search-replace.c:1727
-#: ../plugins/search/search-replace.c:2056 ../plugins/symbol-db/plugin.c:2278
+#: ../plugins/devhelp/plugin.c:398 ../plugins/search/search-replace.c:1034
+#: ../plugins/search/search-replace.c:1710
+#: ../plugins/search/search-replace.c:1717
+#: ../plugins/search/search-replace.c:1729
+#: ../plugins/search/search-replace.c:2058 ../plugins/symbol-db/plugin.c:2278
 msgid "Search"
 msgstr "���หา"
 
-#: ../plugins/devhelp/plugin.c:420 ../src/anjuta-app.c:439
+#: ../plugins/devhelp/plugin.c:420 ../src/anjuta-app.c:436
 msgid "Help"
 msgstr "วิ�ี���"
 
@@ -2569,58 +2590,65 @@ msgstr "�_���ี�"
 msgid "[read-only]"
 msgstr "[อ�า�อย�า���ียว]"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:1
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:1
 msgid "<b>Autosave</b>"
 msgstr "<b>�าร�ั��ึ�อั���มั�ิ</b>"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:2
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:2
 msgid "<b>Editor tabs</b>"
 msgstr "<b>��������รื�อ�มือ�����</b>"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:3
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
+msgid "Bottom"
+msgstr "ล�า�"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
 msgid "Do not show tabs"
 msgstr "�ม��ส������"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "��ิ�����า��าร�ั��ึ����มอั���มั�ิ"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:5
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+msgid "Left"
+msgstr "��าย"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:7
 msgid "Position:"
 msgstr "�ำ�ห���:"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:6
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
+msgid "Right"
+msgstr "�วา"
+
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:9
 msgid "Save files interval in minutes"
 msgstr "��ว��วลา�ั��ึ����ม�����า�ี"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:7
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:10
 msgid "Save session interval in minutes"
 msgstr "��ว��วลา�ั��ึ�วาระ�����า�ี"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:8
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:11
 msgid "Sorted by most recent use"
 msgstr "�รีย��าม�าร���ล�าสุ�"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:9
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:12
 msgid "Sorted in alphabetical order"
 msgstr "�รีย��าม�ัวอั�ษร"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:10
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:13
 msgid "Sorted in opening order"
 msgstr "�รีย��ามลำ�ั��าร��ิ�"
 
-#: ../plugins/document-manager/anjuta-document-manager.glade.h:11
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:10
-msgid ""
-"Top\n"
-"Bottom\n"
-"Left\n"
-"Right"
-msgstr ""
-"��\n"
-"ล�า�\n"
-"��าย\n"
-"�วา"
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:14
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+msgid "Top"
+msgstr "��"
 
 #: ../plugins/document-manager/plugin.c:147
 msgid "_Save"
@@ -2870,7 +2898,7 @@ msgstr "�ำ��ำ�าร���หาอย�า��ร�ว"
 
 #: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1894
+#: ../plugins/language-support-cpp-java/plugin.c:1910
 msgid "_Edit"
 msgstr "�_����"
 
@@ -3148,8 +3176,8 @@ msgstr "�าร���หา�����าย"
 
 #: ../plugins/document-manager/plugin.c:410
 #: ../plugins/document-manager/plugin.c:1713
-#: ../plugins/document-manager/plugin.c:2125
-#: ../plugins/document-manager/plugin.c:2135
+#: ../plugins/document-manager/plugin.c:2130
+#: ../plugins/document-manager/plugin.c:2140
 msgid "Documents"
 msgstr "�อ�สาร"
 
@@ -3214,7 +3242,7 @@ msgid ""
 msgstr "�าร���หา \"%s\" ����าย���ม �ละ�ริ�มหา��อ�า�������ม ����ม�����อ�วาม�ี��ร�"
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.glade.h:23
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Match case"
 msgstr "�ัว�ิม���ห��-�ล���ร��ั�"
 
@@ -3316,7 +3344,7 @@ msgstr "��ิ���วย:"
 msgid "Document Manager"
 msgstr "��รื�อ�มือ�ั��าร�อ�สาร"
 
-#: ../plugins/file-loader/plugin.c:470 ../plugins/patch/patch-plugin.c:116
+#: ../plugins/file-loader/plugin.c:470 ../plugins/patch/patch-plugin.c:121
 #: ../plugins/run-program/parameters.c:308
 msgid "All files"
 msgstr "�ุ����ม"
@@ -3450,36 +3478,36 @@ msgstr "�รุ�า�ลือ��ลั���ี��ะ����
 msgid "Open With"
 msgstr "��ิ���วย"
 
-#: ../plugins/file-manager/file-manager.glade.h:1
+#: ../plugins/file-manager/file-manager.ui.h:1
 msgid "<b>Filter</b>"
 msgstr "<b>�ัว�รอ�</b>"
 
-#: ../plugins/file-manager/file-manager.glade.h:2
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:2
+#: ../plugins/file-manager/file-manager.ui.h:2
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
 msgid "<b>Global</b>"
 msgstr "<b>Global</b>"
 
-#: ../plugins/file-manager/file-manager.glade.h:3
+#: ../plugins/file-manager/file-manager.ui.h:3
 msgid "Choose Directory to show if no project is open"
 msgstr "�ลือ����ร��อรี�ี��ะ�ส����า�ม�มี��ร��าร��ิ�อยู�"
 
-#: ../plugins/file-manager/file-manager.glade.h:4
+#: ../plugins/file-manager/file-manager.ui.h:4
 msgid "Do not show backup files"
 msgstr "�ม��ส�����มสำรอ�"
 
-#: ../plugins/file-manager/file-manager.glade.h:5
+#: ../plugins/file-manager/file-manager.ui.h:5
 msgid "Do not show binary files (.o, .la, etc.)"
 msgstr "�ม��ส�����ม���ารี (���� .o, .la ฯลฯ)"
 
-#: ../plugins/file-manager/file-manager.glade.h:6
+#: ../plugins/file-manager/file-manager.ui.h:6
 msgid "Do not show hidden files"
 msgstr "�ม��ส�����ม�ี���อ�"
 
-#: ../plugins/file-manager/file-manager.glade.h:7
+#: ../plugins/file-manager/file-manager.ui.h:7
 msgid "Do not show unversioned files"
 msgstr "�ม��ส�����ม�ี��ม�มี�าร�ว��ุมรุ��"
 
-#: ../plugins/file-manager/file-manager.glade.h:8
+#: ../plugins/file-manager/file-manager.ui.h:8
 msgid "Root directory if no project is open:"
 msgstr "���ร��อรีรา���า�ม�มี��ร��าร��ิ�อยู�:"
 
@@ -3504,48 +3532,48 @@ msgstr "URI �ั�����"
 msgid "Uri of the top-most path displayed"
 msgstr "URI �อ��า�ระ�ั���สุ��ี��ส��"
 
-#: ../plugins/file-manager/plugin.c:75
+#: ../plugins/file-manager/plugin.c:74
 msgid "_Rename"
 msgstr "�_�ลี�ย��ื�อ"
 
-#: ../plugins/file-manager/plugin.c:75
+#: ../plugins/file-manager/plugin.c:74
 msgid "Rename file or directory"
 msgstr "��ลี�ย��ื�อ���ม/���ร��อรี"
 
-#: ../plugins/file-manager/plugin.c:295
+#: ../plugins/file-manager/plugin.c:294
 msgid "File manager popup actions"
 msgstr "�าร�ระ�ำ���ม�ู�ุ��ึ���อ���รื�อ�มือ�ั��าร���ม"
 
-#: ../plugins/file-manager/plugin.c:328
+#: ../plugins/file-manager/plugin.c:327
 msgid "Files"
 msgstr "���ม"
 
-#: ../plugins/file-manager/plugin.c:452 ../plugins/file-manager/plugin.c:461
+#: ../plugins/file-manager/plugin.c:456 ../plugins/file-manager/plugin.c:465
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "��รื�อ�มือ�ั��าร���ม"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:1
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
 msgid "<b>File Information</b>"
 msgstr "<b>��อมูล���ม</b>"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:3
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add License Information"
 msgstr "��ิ�ม��อมูลสั��าอ�ุ�า�"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Add to project"
 msgstr "��ิ�ม���า����ร��าร"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
 msgid "Add to repository"
 msgstr "��ิ�ม���า���ลั�"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:6
 msgid "Create corresponding header file"
 msgstr "สร�า����มส�ว�หัว�ี��ร��ั�"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
 msgid ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
@@ -3553,25 +3581,24 @@ msgstr ""
 "��อ��ื�อ���ม\n"
 "�ามส�ุล�ะ�ู���ิม�าม��ิ��อ����ม"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:10
-#: ../plugins/git/anjuta-git.glade.h:66
-#: ../plugins/macro/anjuta-macro.glade.h:6
-#: ../plugins/tools/anjuta-tools.glade.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:74 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Name:"
 msgstr "�ื�อ:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:11
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
 #: ../plugins/starter/starter.c:404
 msgid "New File"
 msgstr "���ม�หม�"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:12
-#: ../plugins/gbf-am/gbf-am-properties.c:1517
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:12
+#: ../plugins/gbf-am/gbf-am-properties.c:1524
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:350
 msgid "Type:"
 msgstr "��ิ�:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.glade.h:13
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:13
 msgid "Use Template for the Header file"
 msgstr "����ม����สำหรั����มส�ว�หัว"
 
@@ -3611,21 +3638,11 @@ msgstr "���มส�ริ�����ลล�"
 msgid "Other"
 msgstr "อื�� �"
 
-#: ../plugins/file-wizard/file.c:100
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
-msgid "General Public License (GPL)"
-msgstr "สั��าอ�ุ�า�สา�าร�ะ�ั�ว����ู (GPL)"
-
-#: ../plugins/file-wizard/file.c:101
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
-msgid "Lesser General Public License (LGPL)"
-msgstr "สั��าอ�ุ�า�สา�าร�ะ�ั�ว�������อ��ร���ู (LGPL)"
-
 #: ../plugins/file-wizard/file.c:102
 msgid "BSD Public License"
 msgstr "สั��าอ�ุ�า�สา�าร�ะ BSD"
 
-#: ../plugins/file-wizard/file.c:178
+#: ../plugins/file-wizard/file.c:179
 msgid "Unable to build user interface for New File"
 msgstr "สร�า�ส�ว��ิ���อ�ู����สำหรั� \"���ม�หม�\" �ม����"
 
@@ -3633,27 +3650,27 @@ msgstr "สร�า�ส�ว��ิ���อ�ู����สำห
 msgid "Invalid GbfAmConfigValue type"
 msgstr "��ิ��อ� GbfAmConfigValue �ม��ู���อ�"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:1
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:1
 msgid "<b>Select Package to add:</b>"
 msgstr "<b>�ลือ��������ี��ะ��ิ�ม:</b>"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:2
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _Package"
 msgstr "��ิ�ม�_�����"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
 msgid "Add _module"
 msgstr "��ิ�ม_มอ�ูล"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
 msgid "Packages"
 msgstr "������"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:6
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "�ลือ�������"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.glade.h:7
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:7
 msgid "Variables"
 msgstr "�ัว��ร"
 
@@ -3858,160 +3875,160 @@ msgstr "�ม�สามาร�ล��อร�ส���"
 msgid "Project directory"
 msgstr "���ร��อรี��ร��าร"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:342
-#: ../plugins/gbf-am/gbf-am-properties.c:394
+#: ../plugins/gbf-am/gbf-am-properties.c:341
+#: ../plugins/gbf-am/gbf-am-properties.c:393
 msgid "Enter new module"
 msgstr "��อ�มอ�ูล�หม�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:430
-#: ../plugins/gbf-am/gbf-am-properties.c:923
+#: ../plugins/gbf-am/gbf-am-properties.c:434
+#: ../plugins/gbf-am/gbf-am-properties.c:930
 msgid "Module/Packages"
 msgstr "มอ�ูล/������"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:437
-#: ../plugins/gbf-am/gbf-am-properties.c:932
+#: ../plugins/gbf-am/gbf-am-properties.c:441
+#: ../plugins/gbf-am/gbf-am-properties.c:939
 msgid "Version"
 msgstr "รุ��"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:523
+#: ../plugins/gbf-am/gbf-am-properties.c:527
 #, c-format
 msgid ""
 "Are you sure you want to remove module \"%s\" and all its associated "
 "packages?"
 msgstr "ยื�ยั�ว�า��อ��ารล�มอ�ูล \"%s\" �ละ�������ี���ี�ยว��อ��ั��หม�หรือ�ม�?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:525
+#: ../plugins/gbf-am/gbf-am-properties.c:529
 #, c-format
 msgid "Are you sure you want to remove package \"%s\"?"
 msgstr "ยื�ยั�ว�า��อ��ารล������� \"%s\" หรือ�ม�?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:583
-#: ../plugins/gbf-am/gbf-am-properties.c:665
+#: ../plugins/gbf-am/gbf-am-properties.c:587
+#: ../plugins/gbf-am/gbf-am-properties.c:669
 msgid "Enter new variable"
 msgstr "��อ��ัว��ร�หม�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:696
+#: ../plugins/gbf-am/gbf-am-properties.c:700
 #, c-format
 msgid "Are you sure you want to remove variable \"%s\"?"
 msgstr "ยื�ยั�ว�า��อ��ารล��ัว��ร  \"%s\" หรือ�ม�?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:847
+#: ../plugins/gbf-am/gbf-am-properties.c:854
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:177
 msgid "Project:"
 msgstr "��ร��าร:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:850
+#: ../plugins/gbf-am/gbf-am-properties.c:857
 msgid "Package name:"
 msgstr "�ื�อ������:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:853
+#: ../plugins/gbf-am/gbf-am-properties.c:860
 #: ../plugins/project-wizard/templates/translatable-strings.h:101
 msgid "Version:"
 msgstr "รุ��:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:856
+#: ../plugins/gbf-am/gbf-am-properties.c:863
 msgid "Url:"
 msgstr "Url:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1222
+#: ../plugins/gbf-am/gbf-am-properties.c:1229
 msgid "Use"
 msgstr "���"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1314
+#: ../plugins/gbf-am/gbf-am-properties.c:1321
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:244
 msgid "Group name:"
 msgstr "�ื�อ�ลุ�ม:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1317
+#: ../plugins/gbf-am/gbf-am-properties.c:1324
 msgid "Advanced"
 msgstr "ระ�ั�สู�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1322
-#: ../plugins/gbf-am/gbf-am-properties.c:1412
+#: ../plugins/gbf-am/gbf-am-properties.c:1329
+#: ../plugins/gbf-am/gbf-am-properties.c:1419
 msgid "C compiler flags:"
 msgstr "��ล���อ��อม���ลอร�ภาษา�ี:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-am/gbf-am-properties.c:1331
 msgid "C preprocessor flags:"
 msgstr "��ล���อ� preprocessor ภาษา�ี:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1326
+#: ../plugins/gbf-am/gbf-am-properties.c:1333
 msgid "C++ compiler flags:"
 msgstr "��ล���อ��อม���ลอร�ภาษา�ี�ลัส�ลัส:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1328
+#: ../plugins/gbf-am/gbf-am-properties.c:1335
 msgid "gcj compiler flags (ahead-of-time):"
 msgstr "��ล���อ��อม���ลอร� gcj (ahead-of-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1330
+#: ../plugins/gbf-am/gbf-am-properties.c:1337
 msgid "Java compiler flags (just-in-time):"
 msgstr "��ล���อ��อม���ลอร�ภาษา�าวา (just-in-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1332
-#: ../plugins/gbf-am/gbf-am-properties.c:1420
+#: ../plugins/gbf-am/gbf-am-properties.c:1339
+#: ../plugins/gbf-am/gbf-am-properties.c:1427
 msgid "Fortran compiler flags:"
 msgstr "��ล���อ��อม���ลอร�ภาษา�อร���ร�:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1335
+#: ../plugins/gbf-am/gbf-am-properties.c:1342
 msgid "Includes (deprecated):"
 msgstr "�า����มส�ว�หัว (�ม�ส�ั�ส�ุ��ห����):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1346
+#: ../plugins/gbf-am/gbf-am-properties.c:1353
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:258
 msgid "Install directories:"
 msgstr "���ร��อรี�ิ��ั��:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1414
+#: ../plugins/gbf-am/gbf-am-properties.c:1421
 msgid "C preprocessor flags"
 msgstr "��ล���อ� preprocessor ภาษา�ี"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1416
+#: ../plugins/gbf-am/gbf-am-properties.c:1423
 msgid "C++ compiler flags"
 msgstr "��ล���อ��อม���ลอร�ภาษา�ี�ลัส�ลัส:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1418
+#: ../plugins/gbf-am/gbf-am-properties.c:1425
 msgid "gcj compiler flags (ahead-of-time)"
 msgstr "��ล���อ��อม���ลอร� gcj (ahead-of-time)"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1424
+#: ../plugins/gbf-am/gbf-am-properties.c:1431
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:410
 msgid "Linker flags:"
 msgstr "��าส�า�ะ�อ���ร��รมลิ���:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1430
+#: ../plugins/gbf-am/gbf-am-properties.c:1437
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:416
 msgid "Libraries:"
 msgstr "�ล�ารี:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1436
+#: ../plugins/gbf-am/gbf-am-properties.c:1443
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:422
 msgid "Dependencies:"
 msgstr "สิ���ี���อ����:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1439
+#: ../plugins/gbf-am/gbf-am-properties.c:1446
 msgid "Advanced options"
 msgstr "�ัว�ลือ�ระ�ั�สู�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1514
+#: ../plugins/gbf-am/gbf-am-properties.c:1521
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:347
 msgid "Target name:"
 msgstr "�ื�อ���าหมาย:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1523
+#: ../plugins/gbf-am/gbf-am-properties.c:1530
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:356
 msgid "Group:"
 msgstr "�ลุ�ม:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1541
-#: ../plugins/gbf-am/gbf-am-properties.c:1557
+#: ../plugins/gbf-am/gbf-am-properties.c:1548
 #: ../plugins/gbf-am/gbf-am-properties.c:1564
+#: ../plugins/gbf-am/gbf-am-properties.c:1571
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:374
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:391
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:398
 msgid "Install directory:"
 msgstr "���ร��อรี�ิ��ั��:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1576
+#: ../plugins/gbf-am/gbf-am-properties.c:1583
 msgid "Advanced..."
 msgstr "ระ�ั�สู�..."
 
@@ -4236,358 +4253,408 @@ msgstr "สร�า����ม fifo �ื�อ %s �ม�สำ�ร
 msgid "Cannot start terminal for debugging."
 msgstr "�ม�สามาร��ริ�ม��อร�มิ�ัลสำหรั��ี�ั��"
 
-#: ../plugins/git/anjuta-git.glade.h:1
+#: ../plugins/git/anjuta-git.ui.h:1
 msgid "<b>Bad revision:</b>"
 msgstr "<b>��ั�������ี��สียหาย:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:2
+#: ../plugins/git/anjuta-git.ui.h:2
 msgid "<b>Branch name:</b>"
 msgstr "<b>�ื�อ����:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:3
+#: ../plugins/git/anjuta-git.ui.h:3
 msgid "<b>Branch to delete:</b>"
 msgstr "<b>�����ี��ะล�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:4
+#: ../plugins/git/anjuta-git.ui.h:4
 msgid "<b>Branch to switch to:</b>"
 msgstr "<b>�����ี��ะสลั���:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:5
+#: ../plugins/git/anjuta-git.ui.h:5
 msgid "<b>Branch:</b>"
 msgstr "<b>����:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:6
-#: ../plugins/subversion/anjuta-subversion.glade.h:2
+#: ../plugins/git/anjuta-git.ui.h:6
+#: ../plugins/subversion/anjuta-subversion.ui.h:2
 msgid "<b>Changes:</b>"
 msgstr "<b>�าร��ลี�ย���ล�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:7
+#: ../plugins/git/anjuta-git.ui.h:7
+msgid "<b>Commit to Cherry Pick:</b>"
+msgstr "<b>Commit �ี��ะ������ี�ยวมา���:</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:8
 msgid "<b>Commit to revert:</b>"
 msgstr "<b>Commit �ี��ะย�อ��ื�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:8
+#: ../plugins/git/anjuta-git.ui.h:9
 msgid "<b>Filters</b>"
 msgstr "<b>�ัว�รอ�</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:9
+#: ../plugins/git/anjuta-git.ui.h:10
 msgid "<b>Folder to create patches in:</b>"
 msgstr "<b>��ล��อร��ี��ะสร�า������:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:10
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "<b>Generate patches relative to:</b>"
 msgstr "<b>สร�า��������ีย��ั�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:11
+#: ../plugins/git/anjuta-git.ui.h:12
 msgid "<b>Good revision:</b>"
 msgstr "<b>��ั�������ี��ี:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:12
-#: ../plugins/subversion/anjuta-subversion.glade.h:7
+#: ../plugins/git/anjuta-git.ui.h:13
+#: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "<b>Log Message:</b>"
 msgstr "<b>��อ�วาม�ูม:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:13
+#: ../plugins/git/anjuta-git.ui.h:14
 msgid "<b>Log message:</b>"
 msgstr "<b>��อ�วาม�ูม:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:14
+#: ../plugins/git/anjuta-git.ui.h:15
+msgid "<b>Mailbox file containing patches:</b>"
+msgstr "<b>���ม�ล�อ���หมาย�ี�มี�����:</b>"
+
+#: ../plugins/git/anjuta-git.ui.h:16
 msgid "<b>Mode:</b>"
 msgstr "<b>�หม�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:16
+#: ../plugins/git/anjuta-git.ui.h:19
 msgid "<b>Remote branch to rebase from:</b>"
 msgstr "<b>�����ี��ม���าย�ี��ะ��� rebase:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:17
+#: ../plugins/git/anjuta-git.ui.h:20
 msgid "<b>Remote to delete:</b>"
 msgstr "<b>ราย�าร�ี��ม���าย�ี��ะล�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:18
+#: ../plugins/git/anjuta-git.ui.h:21
 msgid "<b>Repository to pull from:</b>"
 msgstr "<b>�ลั��ี��ะ pull:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:19
+#: ../plugins/git/anjuta-git.ui.h:22
 msgid "<b>Repository to push to:</b>"
 msgstr "<b>�ลั��ี��ะ push ��:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:20
+#: ../plugins/git/anjuta-git.ui.h:23
 msgid "<b>Reset to:</b>"
 msgstr "<b>ล�า���อมูล����:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:21
-#: ../plugins/subversion/anjuta-subversion.glade.h:10
+#: ../plugins/git/anjuta-git.ui.h:24
+#: ../plugins/subversion/anjuta-subversion.ui.h:11
 msgid "<b>Revision:</b>"
 msgstr "<b>��ั������:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:22
+#: ../plugins/git/anjuta-git.ui.h:25
 msgid "<b>Select Files to Check Out:</b>"
 msgstr "<b>�ลือ����ม�ี��ะ Check Out:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:23
-#: ../plugins/subversion/anjuta-subversion.glade.h:13
+#: ../plugins/git/anjuta-git.ui.h:26
+#: ../plugins/subversion/anjuta-subversion.ui.h:14
 msgid "<b>Select Files to Commit:</b>"
 msgstr "<b>�ลือ����ม�ี��ะ Commit:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:24
+#: ../plugins/git/anjuta-git.ui.h:27
 msgid "<b>Select Files to Ignore:</b>"
 msgstr "<b>�ลือ����ม�ี��ะละ�ลย:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:25
-#: ../plugins/subversion/anjuta-subversion.glade.h:14
+#: ../plugins/git/anjuta-git.ui.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:15
 msgid "<b>Select Files to Mark as Resolved:</b>"
 msgstr "<b>�ลือ����ม�ี��ำ��รื�อ�หมายว�า�����อ�ั��ย���ล�ว:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:26
+#: ../plugins/git/anjuta-git.ui.h:29
 msgid "<b>Select Files to Unstage:</b>"
 msgstr "<b>�ลือ����ม�ี��ะ Unstage:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:27
+#: ../plugins/git/anjuta-git.ui.h:30
 msgid "<b>Select file to add:</b>"
 msgstr "<b>�ลือ����ม�ี��ะ��ิ�ม:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:28
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "<b>Select file to remove:</b>"
 msgstr "<b>�ลือ����ม�ี�ล�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:29
+#: ../plugins/git/anjuta-git.ui.h:32
 msgid "<b>Tag name:</b>"
 msgstr "<b>�ื�อ����:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:30
+#: ../plugins/git/anjuta-git.ui.h:33
 msgid "<b>URL:</b>"
 msgstr "<b>URL:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:31
-#: ../plugins/subversion/anjuta-subversion.glade.h:18
+#: ../plugins/git/anjuta-git.ui.h:34
+#: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "<b>View the Log for File/Folder:</b>"
 msgstr "<b>�ู�ูม�อ����ม/��ล��อร�:</b>"
 
-#: ../plugins/git/anjuta-git.glade.h:32
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Add File"
 msgstr "��ิ�ม���ม"
 
-#: ../plugins/git/anjuta-git.glade.h:33
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Add Remote Branch"
 msgstr "��ิ�ม�����ี��ม���าย"
 
 #. A signed off by line is something git adds to the end of a commit message that indicates that a patch passes your scrutiny as you commit it to your git tree.
-#: ../plugins/git/anjuta-git.glade.h:35
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Add signed off by line"
 msgstr "��ิ�ม�รร�ั������ำ�ั���ย"
 
-#: ../plugins/git/anjuta-git.glade.h:36
+#: ../plugins/git/anjuta-git.ui.h:39
+msgid "Add signed-off by line"
+msgstr "��ิ�ม�รร�ั������ำ�ั���ย"
+
+#: ../plugins/git/anjuta-git.ui.h:40
+msgid "Amend the previous commit"
+msgstr "��อม commit ��อ�ห��า"
+
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Annotate this tag"
 msgstr "�ำหมาย�ห�ุ�ระ�อ������ี�"
 
 #. Normally when you fetch new objets from a remote branch you are tracking, git overwrites the data from the last fetch. With this option, data will be appended to the previous information, preserving it if the user should need it.
-#: ../plugins/git/anjuta-git.glade.h:38
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Append fetch data"
 msgstr "��ิ�ม��อมูล�ี� fetch มา��อ��าย"
 
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:44 ../plugins/git/plugin.c:213
+msgid "Apply mailbox files"
+msgstr "�ำ��ิ��าร��ย������ม�ล�อ���หมาย"
+
 #. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
-#: ../plugins/git/anjuta-git.glade.h:40
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Author/Grep"
 msgstr "�ู���ีย�/Grep"
 
-#: ../plugins/git/anjuta-git.glade.h:41
+#: ../plugins/git/anjuta-git.ui.h:47
 #: ../plugins/project-wizard/templates/translatable-strings.h:24
 msgid "Author:"
 msgstr "�ู���ีย�:"
 
-#: ../plugins/git/anjuta-git.glade.h:42
+#: ../plugins/git/anjuta-git.ui.h:48
 msgid "Branch must be fully merged"
 msgstr "�����ะ��อ��สา��ั��หม�"
 
-#: ../plugins/git/anjuta-git.glade.h:43
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "Check Out Files"
 msgstr "Check Out ���ม"
 
-#: ../plugins/git/anjuta-git.glade.h:44
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Check out the branch after it is created"
 msgstr "Check out ����หลั��า�สร�า��สร��"
 
-#: ../plugins/git/anjuta-git.glade.h:45
-#: ../plugins/subversion/anjuta-subversion.glade.h:24
+#: ../plugins/git/anjuta-git.ui.h:52
+msgid "Cherry Pick"
+msgstr "������ี�ยว"
+
+#: ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:25
 msgid "Commit Changes"
 msgstr "Commit �าร��ลี�ย���ล�"
 
-#: ../plugins/git/anjuta-git.glade.h:46
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Commit on fast-forward merges"
 msgstr "Commit �มื�อ�สา���� fast-forward"
 
-#: ../plugins/git/anjuta-git.glade.h:47
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Create Branch"
 msgstr "สร�า�����"
 
-#: ../plugins/git/anjuta-git.glade.h:48
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Create Tag"
 msgstr "สร�า�����"
 
-#: ../plugins/git/anjuta-git.glade.h:49
+#: ../plugins/git/anjuta-git.ui.h:57
 msgid "Create patch series"
 msgstr "สร�า��ุ�ลำ�ั������"
 
-#: ../plugins/git/anjuta-git.glade.h:50 ../plugins/git/git-log-dialog.c:188
+#: ../plugins/git/anjuta-git.ui.h:58 ../plugins/git/git-log-dialog.c:188
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "วั��ี�"
 
-#: ../plugins/git/anjuta-git.glade.h:51
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Delete Branch"
 msgstr "ล�����"
 
-#: ../plugins/git/anjuta-git.glade.h:52
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Delete Remote Branch"
 msgstr "ล������ี��ม���าย"
 
-#: ../plugins/git/anjuta-git.glade.h:53
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Do not commit"
 msgstr "�ม� commit"
 
-#: ../plugins/git/anjuta-git.glade.h:54
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Do not follow tags"
 msgstr "�ม���อ��าม����"
 
-#: ../plugins/git/anjuta-git.glade.h:55
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "E-mail:"
 msgstr "อี�มล:"
 
-#: ../plugins/git/anjuta-git.glade.h:56
+#: ../plugins/git/anjuta-git.ui.h:64
 msgid "Fetch remote branches after creation"
 msgstr "Fetch �����า��ม���ายหลั��า�สร�า��สร��"
 
-#: ../plugins/git/anjuta-git.glade.h:57
-#: ../plugins/subversion/anjuta-subversion.glade.h:32
+#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/subversion/anjuta-subversion.ui.h:33
 msgid "Force"
 msgstr "�ั��ั�"
 
-#: ../plugins/git/anjuta-git.glade.h:59
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "From:"
 msgstr "�า�:"
 
-#: ../plugins/git/anjuta-git.glade.h:60
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.glade.h:61
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Hard"
 msgstr "����"
 
-#: ../plugins/git/anjuta-git.glade.h:62
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Head"
 msgstr "Head"
 
-#: ../plugins/git/anjuta-git.glade.h:63
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "Ignore Files"
 msgstr "ละ�ลย���ม"
 
-#: ../plugins/git/anjuta-git.glade.h:64
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Merge"
 msgstr "�สา�"
 
-#: ../plugins/git/anjuta-git.glade.h:65
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Mixed"
 msgstr "�สม"
 
-#: ../plugins/git/anjuta-git.glade.h:67
+#: ../plugins/git/anjuta-git.ui.h:75
 msgid "Previous commit"
 msgstr "Commit ��อ�ห��า"
 
-#: ../plugins/git/anjuta-git.glade.h:68
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Pull"
 msgstr "Pull"
 
-#: ../plugins/git/anjuta-git.glade.h:69
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Push"
 msgstr "Push"
 
-#: ../plugins/git/anjuta-git.glade.h:70
+#: ../plugins/git/anjuta-git.ui.h:78
 msgid "Push all refs"
 msgstr "Push ref �ั��หม�"
 
-#: ../plugins/git/anjuta-git.glade.h:71
+#: ../plugins/git/anjuta-git.ui.h:79
 msgid "Push tags"
 msgstr "Push tag ��า��"
 
-#: ../plugins/git/anjuta-git.glade.h:72
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Rebase"
 msgstr "Rebase"
 
-#: ../plugins/git/anjuta-git.glade.h:73
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Remove File"
 msgstr "ล����ม"
 
-#: ../plugins/git/anjuta-git.glade.h:74
+#: ../plugins/git/anjuta-git.ui.h:82
+msgid "Repository origin"
+msgstr "�����ั��อ��ลั�"
+
+#: ../plugins/git/anjuta-git.ui.h:83
 msgid "Reset Tree"
 msgstr "ล�า���อมูล Tree"
 
-#: ../plugins/git/anjuta-git.glade.h:75
-#: ../plugins/subversion/anjuta-subversion.glade.h:44
+#: ../plugins/git/anjuta-git.ui.h:84
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Retrieving status..."
 msgstr "�ำลั��ึ�ส�า�ะ..."
 
-#: ../plugins/git/anjuta-git.glade.h:76
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revert Commit"
 msgstr "�รีย� Commit �ื�"
 
-#: ../plugins/git/anjuta-git.glade.h:77
+#: ../plugins/git/anjuta-git.ui.h:86
 msgid "Revision/Tag:"
 msgstr "��ั������/����:"
 
-#: ../plugins/git/anjuta-git.glade.h:79
+#: ../plugins/git/anjuta-git.ui.h:88
 msgid "Select A Folder"
 msgstr "�ลือ���ล��อร�"
 
-#: ../plugins/git/anjuta-git.glade.h:80
-#: ../plugins/subversion/anjuta-subversion.glade.h:48
+#: ../plugins/git/anjuta-git.ui.h:89
+msgid "Select Mailbox File"
+msgstr "�ลือ����ม Mailbox"
+
+#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Set Conflicts as Resolved"
 msgstr "�ำห�����ม�ี��ั��ย��ว�า�����อ�ั��ย���ล�ว"
 
-#: ../plugins/git/anjuta-git.glade.h:81
+#: ../plugins/git/anjuta-git.ui.h:91
+msgid "Show source revision in log message"
+msgstr "�ส��รุ���อ��อร�ส����อ�วาม�ูม"
+
+#: ../plugins/git/anjuta-git.ui.h:92
+msgid "Sign this tag"
+msgstr "�����ำ�ั������ี�"
+
+#: ../plugins/git/anjuta-git.ui.h:93
 msgid "Soft"
 msgstr "อ�อ�"
 
-#: ../plugins/git/anjuta-git.glade.h:82
+#: ../plugins/git/anjuta-git.ui.h:94
 msgid "Squash"
 msgstr "อั�รวม"
 
-#: ../plugins/git/anjuta-git.glade.h:83
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Switch to Another Branch"
 msgstr "สลั�������อื��"
 
-#: ../plugins/git/anjuta-git.glade.h:84
+#: ../plugins/git/anjuta-git.ui.h:96
 msgid "Tag/Commit"
 msgstr "����/Commit"
 
-#: ../plugins/git/anjuta-git.glade.h:85
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "commit �ี�สรุ��าร�สา��ี��ม�สำ�ร�� (��� -i)"
 
-#: ../plugins/git/anjuta-git.glade.h:87
+#: ../plugins/git/anjuta-git.ui.h:99
 msgid "To:"
 msgstr "�ึ�:"
 
-#: ../plugins/git/anjuta-git.glade.h:88
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Unstage Files"
 msgstr "Unstage ���ม"
 
-#: ../plugins/git/anjuta-git.glade.h:89
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Use a custom log message"
 msgstr "�ำห����อ�วาม�ูม�อ�"
 
-#: ../plugins/git/anjuta-git.glade.h:90
+#: ../plugins/git/anjuta-git.ui.h:102
 msgid "Use custom author information:"
 msgstr "�ำห����อมูล�ู���ีย�:"
 
-#: ../plugins/git/anjuta-git.glade.h:91
+#: ../plugins/git/anjuta-git.ui.h:103
 msgid "View log"
 msgstr "�ู�ูม"
 
+#: ../plugins/git/anjuta-git.ui.h:105
+msgid "gtk-cancel"
+msgstr "gtk-cancel"
+
+#: ../plugins/git/anjuta-git.ui.h:106
+msgid "gtk-ok"
+msgstr "gtk-ok"
+
 #: ../plugins/git/git-add-dialog.c:36
 msgid "Git: File staged for add."
 msgstr "Git: stage ���ม��ื�อ��ิ�ม�ล�ว"
 
-#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:62
+#: ../plugins/git/git-add-dialog.c:62 ../plugins/git/git-remove-dialog.c:63
 msgid "Please select a file."
 msgstr "�รุ�า�ลือ����ม"
 
@@ -4610,9 +4677,14 @@ msgstr "�รุ�า��อ� URL"
 msgid "Git: Fetching..."
 msgstr "Git: �ำลั� fetch..."
 
+#: ../plugins/git/git-apply-mailbox-dialog.c:45
+msgid "Please select a mailbox file."
+msgstr "�รุ�า�ลือ����ม�ล�อ���หมาย"
+
 #: ../plugins/git/git-bisect-dialog.c:54
+#: ../plugins/git/git-cherry-pick-dialog.c:52
 #: ../plugins/git/git-create-branch-dialog.c:89
-#: ../plugins/git/git-create-tag-dialog.c:99
+#: ../plugins/git/git-create-tag-dialog.c:102
 #: ../plugins/git/git-reset-dialog.c:57 ../plugins/git/git-revert-dialog.c:46
 #: ../plugins/subversion/subversion-copy-dialog.c:207
 #: ../plugins/subversion/subversion-switch-dialog.c:122
@@ -4625,17 +4697,17 @@ msgstr "Git: �ึ����มมา�ล�ว"
 
 #: ../plugins/git/git-checkout-files-dialog.c:36
 msgid "Git: Files checked out."
-msgstr "Git: checked out ���มมา�ล�ว"
+msgstr "Git: check out ���มมา�ล�ว"
 
 #: ../plugins/git/git-commit-dialog.c:36
 msgid "Git: Commit complete."
 msgstr "Git: commit �สร��สม�ูร��"
 
-#: ../plugins/git/git-commit-dialog.c:100
+#: ../plugins/git/git-commit-dialog.c:105
 msgid "Please enter the commit author's name."
 msgstr "�รุ�า��อ��ื�อ�ู���ีย�สำหรั�ราย�าร commit"
 
-#: ../plugins/git/git-commit-dialog.c:110
+#: ../plugins/git/git-commit-dialog.c:115
 msgid "Please enter the commit author's e-mail address."
 msgstr "�รุ�า��อ��ี�อยู�อี�มล�ู���ีย�สำหรั�ราย�าร commit"
 
@@ -4649,7 +4721,7 @@ msgstr "Git: สร�า����� \"%s\" �ล�ว"
 msgid "Git: Created tag \"%s\"."
 msgstr "Git: สร�า����� \"%s\" �ล�ว"
 
-#: ../plugins/git/git-create-tag-dialog.c:108
+#: ../plugins/git/git-create-tag-dialog.c:111
 msgid "Please enter a tag name."
 msgstr "�รุ�า��อ��ื�อ����"
 
@@ -4675,11 +4747,11 @@ msgstr "�ูม���สั��"
 msgid "Author"
 msgstr "�ู���ีย�"
 
-#: ../plugins/git/git-log-dialog.c:305
+#: ../plugins/git/git-log-dialog.c:318
 msgid "Git: Retrieving log..."
 msgstr "Git: �ำลั��ึ��ูม..."
 
-#: ../plugins/git/git-log-dialog.c:344
+#: ../plugins/git/git-log-dialog.c:358
 #: ../plugins/subversion/subversion-add-dialog.c:65
 #: ../plugins/subversion/subversion-diff-dialog.c:116
 #: ../plugins/subversion/subversion-remove-dialog.c:98
@@ -4687,17 +4759,21 @@ msgstr "Git: �ำลั��ึ��ูม..."
 msgid "Please enter a path."
 msgstr "�รุ�า��อ��า�"
 
-#: ../plugins/git/git-log-dialog.c:505
+#: ../plugins/git/git-log-dialog.c:403
+msgid "Select a file"
+msgstr "�ลือ����ม"
+
+#: ../plugins/git/git-log-dialog.c:550
 #, c-format
 msgid "<b>Branch:</b> %s"
 msgstr "<b>����:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:510
+#: ../plugins/git/git-log-dialog.c:555
 #, c-format
 msgid "<b>Tag:</b> %s"
 msgstr "<b>����:</b> %s"
 
-#: ../plugins/git/git-log-dialog.c:515
+#: ../plugins/git/git-log-dialog.c:560
 #, c-format
 msgid "<b>Remote:</b> %s"
 msgstr "<b>�ี��ม���าย:</b> %s"
@@ -4710,11 +4786,23 @@ msgstr "Git: �สา��สร��สม�ูร��"
 msgid "Git: Pull complete."
 msgstr "Git: pull �สร��สม�ูร��"
 
-#: ../plugins/git/git-pull-dialog.c:77
+#: ../plugins/git/git-pull-dialog.c:87
 msgid "Please enter the URL of the repository to pull from."
-msgstr "�รุ�า��อ� URL �อ��ลั��ี��ะ pull"
+msgstr "�รุ�า��อ� URL �อ��ลั��ี��ะ pull มา"
+
+#: ../plugins/git/git-push-dialog.c:36
+msgid "Git: Push complete."
+msgstr "Git: push �สร��สม�ูร��"
 
-#: ../plugins/git/git-rebase-dialog.c:49
+#: ../plugins/git/git-push-dialog.c:75
+msgid "Please enter the URL of the repository to push to."
+msgstr "�รุ�า��อ� URL �อ��ลั��ี��ะ push ��"
+
+#: ../plugins/git/git-push-dialog.c:85
+msgid "Git: Pushing..."
+msgstr "Git: �ำลั� push..."
+
+#: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
 msgstr "Git: �ำลั� rebase"
 
@@ -4735,7 +4823,7 @@ msgstr "Git: checkout �����สร��สม�ูร��"
 msgid "Git"
 msgstr "Git"
 
-#: ../plugins/git/git-ui-utils.c:438
+#: ../plugins/git/git-ui-utils.c:455
 msgid "Git: Diff complete."
 msgstr "Git: diff �สร��สม�ูร��"
 
@@ -4745,242 +4833,272 @@ msgstr "Git: unstage ���ม�ล�ว"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:59 ../plugins/git/plugin.c:420
+#: ../plugins/git/plugin.c:61 ../plugins/git/plugin.c:485
 msgid "_Git"
 msgstr "_Git"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:67 ../plugins/subversion/plugin.c:76
+#: ../plugins/git/plugin.c:69 ../plugins/subversion/plugin.c:76
 msgid "_Commit..."
 msgstr "_Commit..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:75
+#: ../plugins/git/plugin.c:77
 msgid "_Fetch"
 msgstr "_Fetch"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:83
+#: ../plugins/git/plugin.c:85
 msgid "_Rebase"
 msgstr "_Rebase"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:91 ../plugins/git/plugin.c:195
+#: ../plugins/git/plugin.c:93 ../plugins/git/plugin.c:357
 msgid "_Start..."
 msgstr "_�ริ�ม..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:99
+#: ../plugins/git/plugin.c:101
 msgid "_Continue"
 msgstr "�ำ_��อ��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:107
+#: ../plugins/git/plugin.c:109
 msgid "_Skip"
 msgstr "_��าม"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:115
+#: ../plugins/git/plugin.c:117 ../plugins/git/plugin.c:245
 msgid "_Abort"
 msgstr "�_ลิ��ำ"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:123
-msgid "_Pull..."
-msgstr "_Pull..."
+#: ../plugins/git/plugin.c:125
+msgid "_Push..."
+msgstr "_Push..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:131
-msgid "_Unstage files..."
-msgstr "_Unstage ���ม..."
+#: ../plugins/git/plugin.c:133
+msgid "_Pull..."
+msgstr "_Pull..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:139
-msgid "_Check out files..."
-msgstr "_Check out ���ม..."
+#: ../plugins/git/plugin.c:141
+msgid "_Diff uncommitted changes"
+msgstr "_Diff �าร��ลี�ย���ล��ี�ยั��ม� commit"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:147
-msgid "_Resolve conflicts..."
-msgstr "�_����อ�ั��ย��..."
+#: ../plugins/git/plugin.c:149 ../plugins/git/plugin.c:309
+#: ../plugins/git/plugin.c:501 ../plugins/subversion/plugin.c:60
+#: ../plugins/subversion/plugin.c:175
+msgid "_Add..."
+msgstr "�_�ิ�ม..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:155
-msgid "Create patch series..."
-msgstr "สร�า��ุ�ลำ�ั������..."
+#: ../plugins/git/plugin.c:157 ../plugins/git/plugin.c:509
+#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
+msgid "_Remove..."
+msgstr "_ล�..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:163 ../plugins/git/plugin.c:376
-msgid "_Reset tree..."
-msgstr "_ล�า���อมูล tree..."
+#: ../plugins/git/plugin.c:165
+msgid "_Ignore..."
+msgstr "_ละ�ลย..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:171 ../plugins/git/plugin.c:384
-msgid "_Revert commit..."
-msgstr "�_รีย� commit �ื�..."
+#: ../plugins/git/plugin.c:173
+msgid "_Check out files..."
+msgstr "_Check out ���ม..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:179
-msgid "_Branches"
-msgstr "�_���"
+#: ../plugins/git/plugin.c:181
+msgid "_Unstage files..."
+msgstr "_Unstage ���ม..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:187
-msgid "Bisect"
-msgstr "�����ีละ�รึ��"
+#: ../plugins/git/plugin.c:189
+msgid "_Resolve conflicts..."
+msgstr "�_����อ�ั��ย��..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:211
-msgid "_Good"
-msgstr "_�ี"
+#: ../plugins/git/plugin.c:197 ../plugins/patch/patch-plugin.c:116
+msgid "Patches"
+msgstr "�����"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:219
-msgid "_Bad"
-msgstr "�_สีย"
+#: ../plugins/git/plugin.c:205
+msgid "Create patch series..."
+msgstr "สร�า��ุ�ลำ�ั������..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:227 ../plugins/git/plugin.c:428
-msgid "_View log..."
-msgstr "_�ู�ูม..."
+#: ../plugins/git/plugin.c:221
+msgid "_Apply..."
+msgstr "�_ริ�ม���..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:235 ../plugins/git/plugin.c:300
-#: ../plugins/git/plugin.c:436 ../plugins/subversion/plugin.c:60
-#: ../plugins/subversion/plugin.c:175
-msgid "_Add..."
-msgstr "�_�ิ�ม..."
+#: ../plugins/git/plugin.c:229
+msgid "_Continue with resolved conflicts"
+msgstr "_�ำ��ิ��าร��อ�ั���อ�ั��ย���ี�����ล�ว..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:243 ../plugins/git/plugin.c:444
-#: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_ล�..."
+#: ../plugins/git/plugin.c:237
+msgid "_Skip current patch"
+msgstr "_��าม������ั��ุ�ั�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:251
-msgid "_Ignore..."
-msgstr "_ละ�ลย..."
+#: ../plugins/git/plugin.c:253
+msgid "_Branches"
+msgstr "�_���"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:260 ../plugins/git/plugin.c:360
+#: ../plugins/git/plugin.c:261 ../plugins/git/plugin.c:417
 msgid "_Create branch..."
 msgstr "_สร�า�����..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:268
+#: ../plugins/git/plugin.c:269
 msgid "_Delete branch..."
 msgstr "_ล�����..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:276
+#: ../plugins/git/plugin.c:277
 msgid "_Switch to another branch..."
 msgstr "_สลั�������อื��..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:284
+#: ../plugins/git/plugin.c:285
 msgid "_Merge..."
 msgstr "_�สา�..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:292
+#: ../plugins/git/plugin.c:293 ../plugins/git/plugin.c:449
+msgid "_Cherry pick..."
+msgstr "�_�����ี�ยว..."
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:301
 msgid "_Remote branches"
 msgstr "����_�ี��ม���าย"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:308
+#: ../plugins/git/plugin.c:317
 msgid "_Delete..."
 msgstr "_ล�..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:316 ../plugins/git/plugin.c:368
+#: ../plugins/git/plugin.c:325 ../plugins/git/plugin.c:425
 msgid "_Create tag..."
 msgstr "สร�า��_���..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:324
-msgid "_Diff uncommitted changes"
-msgstr "_Diff �าร��ลี�ย���ล��ี�ยั��ม� commit"
+#: ../plugins/git/plugin.c:333 ../plugins/git/plugin.c:433
+msgid "_Reset tree..."
+msgstr "_ล�า���อมูล tree..."
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:332
-msgid "_Push..."
-msgstr "_Push..."
+#: ../plugins/git/plugin.c:341 ../plugins/git/plugin.c:441
+msgid "_Revert commit..."
+msgstr "�_รีย� commit �ื�..."
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:349
+msgid "Bisect"
+msgstr "�����ีละ�รึ��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:344
+#: ../plugins/git/plugin.c:373
+msgid "_Good"
+msgstr "_�ี"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:381
+msgid "_Bad"
+msgstr "�_สีย"
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:389 ../plugins/git/plugin.c:493
+msgid "_View log..."
+msgstr "_�ู�ูม..."
+
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/plugin.c:401
 msgid "_Show commit diff"
 msgstr "�_ส�� diff �อ�ราย�าร commit"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:352
+#: ../plugins/git/plugin.c:409
 msgid "_View selected revision"
 msgstr "�_ส����ั�������ี��ลือ�"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:392
+#: ../plugins/git/plugin.c:457
 msgid "_Bisect"
 msgstr "�_����ีละ�รึ��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:400
+#: ../plugins/git/plugin.c:465
 msgid "_Set good revision"
 msgstr "�ำห��������ั�������ี�_�ี"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:408
+#: ../plugins/git/plugin.c:473
 msgid "_Set bad revision"
 msgstr "�ำห��������ั�������ี��_สียหาย"
 
-#: ../plugins/git/plugin.c:598
+#: ../plugins/git/plugin.c:666
 msgid "Git operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั� git"
 
-#: ../plugins/git/plugin.c:603
+#: ../plugins/git/plugin.c:671
 msgid "Git log operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��าร�ั��ึ��ูม�อ� git"
 
-#: ../plugins/git/plugin.c:608
+#: ../plugins/git/plugin.c:676
 msgid "Git FM operations"
 msgstr "�าร�ระ�ำ�อ� Git FM"
 
-#: ../plugins/git/plugin.c:623
+#: ../plugins/git/plugin.c:691
 msgid "Git Log"
 msgstr "�ูม�อ� Git"
 
@@ -5009,6 +5127,7 @@ msgid "Designer"
 msgstr "��รื�อ�มือออ����"
 
 #: ../plugins/glade/anjuta-glade.glade.h:7
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
 msgid "Editor"
 msgstr "��รื�อ�มือ�����"
 
@@ -5130,8 +5249,8 @@ msgid ""
 "To avoid this messages turn off \"Insert handler on edit\" flag in "
 "Preferences->Glade GUI Designer"
 msgstr ""
-"�ารหลี��ลี�ย���อ�วาม�ี� �ำ�����ย�ิ� \"��ร� handler �มื�อ�����\" �� �รั�����->��รื�อ�มือออ���� "
-"GUI Glade"
+"�ารหลี��ลี�ย���อ�วาม�ี� �ำ�����ย�ิ� \"��ร� handler �มื�อ�����\" �� �รั�����-"
+">��รื�อ�มือออ���� GUI Glade"
 
 #: ../plugins/glade/plugin.c:2380
 msgid "Those documents are already associated"
@@ -5300,13 +5419,12 @@ msgid "Summary:"
 msgstr "สรุ�:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172
-#: ../plugins/macro/anjuta-macro.glade.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:4
 msgid "Category:"
 msgstr "�ระ�ภ�:"
 
 #: ../plugins/gtodo/add_edit_item.c:193 ../plugins/gtodo/add_edit_item.c:472
-#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:75
+#: ../plugins/gtodo/mcategory.c:20 ../plugins/gtodo/todo_db.c:76
 msgid "Edit Categories"
 msgstr "������ระ�ภ�"
 
@@ -5431,58 +5549,58 @@ msgstr "�ำห���สร��"
 msgid "Summary"
 msgstr "สรุ�"
 
-#: ../plugins/gtodo/libgtodo.c:609
+#: ../plugins/gtodo/libgtodo.c:603
 #, c-format
 msgid "No permission to read the file."
 msgstr "�ม�มีสิ��ิ�อ�า����ม"
 
-#: ../plugins/gtodo/libgtodo.c:624
+#: ../plugins/gtodo/libgtodo.c:618
 #, c-format
 msgid "Failed to read file"
 msgstr "อ�า����ม�ม�สำ�ร��"
 
-#: ../plugins/gtodo/libgtodo.c:632 ../plugins/gtodo/libgtodo.c:643
+#: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
 #, c-format
 msgid "Failed to parse xml structure"
 msgstr "�����ร�สร�า� XML �ม�สำ�ร��"
 
-#: ../plugins/gtodo/libgtodo.c:652
+#: ../plugins/gtodo/libgtodo.c:646
 #, c-format
 msgid "File is not a valid gtodo file"
 msgstr "���ม�ม�������ม gtodo �ี��ู���อ�"
 
-#: ../plugins/gtodo/libgtodo.c:668
+#: ../plugins/gtodo/libgtodo.c:662
 msgid "Personal"
 msgstr "ส�ว��ุ��ล"
 
-#: ../plugins/gtodo/libgtodo.c:670
+#: ../plugins/gtodo/libgtodo.c:664
 msgid "Business"
 msgstr "�ุร�ิ�"
 
-#: ../plugins/gtodo/libgtodo.c:672
+#: ../plugins/gtodo/libgtodo.c:666
 msgid "Unfiled"
 msgstr "�ม�มีหมว�"
 
-#: ../plugins/gtodo/libgtodo.c:761
+#: ../plugins/gtodo/libgtodo.c:755
 #, c-format
 msgid "No Gtodo Client to save."
 msgstr "�ม�มีลู���าย Gtodo �ี��ะ����ั��ึ�"
 
-#: ../plugins/gtodo/libgtodo.c:852
+#: ../plugins/gtodo/libgtodo.c:846
 #, c-format
 msgid "No filename supplied."
 msgstr "�ม�����ห��ื�อ���มมา"
 
 #. create a priority string
-#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:129
+#: ../plugins/gtodo/list_tooltip.c:65 ../plugins/gtodo/todo_db.c:130
 msgid "Low"
 msgstr "��ำ"
 
-#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:130
+#: ../plugins/gtodo/list_tooltip.c:71 ../plugins/gtodo/todo_db.c:131
 msgid "Medium"
 msgstr "�า��ลา�"
 
-#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:131
+#: ../plugins/gtodo/list_tooltip.c:77 ../plugins/gtodo/todo_db.c:132
 msgid "High"
 msgstr "สู�"
 
@@ -5640,35 +5758,35 @@ msgid "Allow todo items to notifiy me when they are due in %i minute"
 msgid_plural "Allow todo items to notifiy me when they are due in %i minutes"
 msgstr[0] "�ห�������ือ�ราย�าร todo �มื�อ�ะ�ึ��ำห���� %i �า�ี"
 
-#: ../plugins/gtodo/tasklists.c:9
+#: ../plugins/gtodo/tasklists.c:10
 msgid "Open a Task List"
 msgstr "��ิ�ราย�ารภาร�ิ�"
 
-#: ../plugins/gtodo/tasklists.c:34
+#: ../plugins/gtodo/tasklists.c:35
 msgid "Create a Task List"
 msgstr "สร�า�ราย�ารภาร�ิ�"
 
-#: ../plugins/gtodo/todo_db.c:164
+#: ../plugins/gtodo/todo_db.c:165
 msgid "No Date"
 msgstr "�ม�มีวั��ี�"
 
-#: ../plugins/macro/anjuta-macro.glade.h:1
+#: ../plugins/macro/anjuta-macro.ui.h:1
 msgid "<b>Macro details:</b>"
 msgstr "<b>รายละ�อีย��ม��ร:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:2
+#: ../plugins/macro/anjuta-macro.ui.h:2
 msgid "<b>Macro text:</b>"
 msgstr "<b>��อ�วาม�ม��ร:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:3
+#: ../plugins/macro/anjuta-macro.ui.h:3
 msgid "<b>Macros:</b>"
 msgstr "<b>�ม��ร:</b>"
 
-#: ../plugins/macro/anjuta-macro.glade.h:5
+#: ../plugins/macro/anjuta-macro.ui.h:5
 msgid "Edit..."
 msgstr "�����..."
 
-#: ../plugins/macro/anjuta-macro.glade.h:7
+#: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "�ุ�มลั�:"
 
@@ -5688,7 +5806,7 @@ msgstr "�ม��ร�อ��อ��ู�า"
 msgid "My macros"
 msgstr "�ม��ร�อ��ั�"
 
-#: ../plugins/macro/macro-dialog.c:141
+#: ../plugins/macro/macro-dialog.c:145
 #, c-format
 msgid ""
 "Name:\t %s\n"
@@ -5699,15 +5817,15 @@ msgstr ""
 "�ระ�ภ�:\t %s\n"
 "�ุ�มลั�:\t %c\n"
 
-#: ../plugins/macro/macro-dialog.c:264
+#: ../plugins/macro/macro-dialog.c:276
 msgid "Insert"
 msgstr "��ร�"
 
-#: ../plugins/macro/macro-dialog.c:267
+#: ../plugins/macro/macro-dialog.c:279
 msgid "Insert macro"
 msgstr "��ร��ม��ร"
 
-#: ../plugins/macro/macro-edit.c:204
+#: ../plugins/macro/macro-edit.c:211
 msgid "Add/Edit macro"
 msgstr "��ิ�ม/������ม��ร"
 
@@ -5753,66 +5871,71 @@ msgstr "��ิ�ม/�����/ล��ม��ร"
 msgid "Macro operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��ม��ร"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:1
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
 msgid "<b>Indicators</b>"
 msgstr "<b>�ัว����ี�</b>"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:2
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:2
 msgid "<b>Message colors</b>"
 msgstr "<b>สี��อ�วาม</b>"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:3
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:3
 msgid "<b>Messages options</b>"
 msgstr "<b>�ัว�ลือ�สำหรั���อ�วาม</b>"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:4
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
+msgid "Diagonal"
+msgstr "��ว��ย�"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
 msgid "Error message indicator style:"
 msgstr "รู�����อ��ัว����ี��อ���อ�วาม��อ�ิ��ลา�:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:5
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
 msgid "Errors:"
 msgstr "��อ�ิ��ลา�:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
 msgid "Normal message indicator style:"
 msgstr "รู�����อ��ัว����ี��อ���อ�วาม���ิ:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Number of first characters to show:"
 msgstr "�ำ�ว��อ�อั��ระ�����อ�วาม�ี��ส��:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of last characters to show:"
 msgstr "�ำ�ว��อ�อั��ระ��าย��อ�วาม�ี��ส��:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:9
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+msgid "Strike-Out"
+msgstr "�ี���า"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
 msgid "Tabs position:"
 msgstr "�ำ�ห�������:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:14
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
 msgid "Truncate long messages"
 msgstr "�ั���อ�วาม�ี�ยาว"
 
-#. Error/Warning indication style in editor
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:16
-msgid ""
-"Underline-Plain\n"
-"Underline-Squiggle\n"
-"Underline-TT\n"
-"Diagonal\n"
-"Strike-Out"
-msgstr ""
-"�ี��ส�����-�รรม�า\n"
-"�ี��ส�����-หยั�\n"
-"�ี��ส�����-TT\n"
-"�ส����ย�\n"
-"�ี���า"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
+msgid "Underline-Plain"
+msgstr "�ี��ส�����-�รรม�า"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+msgid "Underline-Squiggle"
+msgstr "�ี��ส�����-�ส��หยั�"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+msgid "Underline-TT"
+msgstr "�ี��ส�����-TT"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Warning message indicator style:"
 msgstr "รู�����อ��ัว����ี��อ���อ�วาม�ำ��ือ�:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.glade.h:22
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
 msgid "Warnings:"
 msgstr "�ำ��ือ�:"
 
@@ -5841,8 +5964,8 @@ msgid "Icon"
 msgstr "�อ�อ�"
 
 #: ../plugins/message-view/message-view.c:583
-#: ../plugins/message-view/plugin.c:325 ../plugins/message-view/plugin.c:439
-#: ../plugins/message-view/plugin.c:451
+#: ../plugins/message-view/plugin.c:325 ../plugins/message-view/plugin.c:445
+#: ../plugins/message-view/plugin.c:457
 msgid "Messages"
 msgstr "��อ�วาม"
 
@@ -5911,44 +6034,40 @@ msgstr "�ั��ึ���อ�วาม"
 msgid "Next/Previous Message"
 msgstr "��อ�วาม�ั���/��อ�ห��า"
 
-#: ../plugins/patch/patch-plugin.c:88
+#: ../plugins/patch/patch-plugin.c:93
 msgid "File/Directory to patch"
 msgstr "���ม/���ร��อรี�ี��ะ�����"
 
-#: ../plugins/patch/patch-plugin.c:91
+#: ../plugins/patch/patch-plugin.c:96
 msgid "Patch file"
 msgstr "���ม�����"
 
-#: ../plugins/patch/patch-plugin.c:111
-msgid "Patches"
-msgstr "�����"
-
-#: ../plugins/patch/patch-plugin.c:160 ../plugins/patch/patch-plugin.glade.h:3
+#: ../plugins/patch/patch-plugin.c:165 ../plugins/patch/patch-plugin.ui.h:3
 msgid "Patch"
 msgstr "�����"
 
-#: ../plugins/patch/patch-plugin.c:180
+#: ../plugins/patch/patch-plugin.c:185
 msgid "Please select the directory where the patch should be applied"
 msgstr "�รุ�า�ลือ����ร��อรี�ี��ะ�รั������วย������ี�"
 
-#: ../plugins/patch/patch-plugin.c:191
+#: ../plugins/patch/patch-plugin.c:196
 #, c-format
 msgid "Patching %s using %s\n"
 msgstr "�ำลั������ %s ��ย��� %s\n"
 
-#: ../plugins/patch/patch-plugin.c:203
+#: ../plugins/patch/patch-plugin.c:208
 msgid "Patching...\n"
 msgstr "�ำลั������...\n"
 
-#: ../plugins/patch/patch-plugin.c:213
+#: ../plugins/patch/patch-plugin.c:218
 msgid "Patching..."
 msgstr "�ำลั������..."
 
-#: ../plugins/patch/patch-plugin.c:218
+#: ../plugins/patch/patch-plugin.c:223
 msgid "There are unfinished jobs, please wait until they are finished."
 msgstr "มี�า��ี�ยั��ม��สร�� �รุ�ารอ���ว�า�ะ�สร���รีย�ร�อย"
 
-#: ../plugins/patch/patch-plugin.c:260
+#: ../plugins/patch/patch-plugin.c:265
 msgid ""
 "Patch failed.\n"
 "Please review the failure messages.\n"
@@ -5958,24 +6077,24 @@ msgstr ""
 "�รุ�า�รว��า���อ�ิ��ลา�\n"
 "�รว��ละล����ม�ี��ู��ี�ออ�\n"
 
-#: ../plugins/patch/patch-plugin.c:266
+#: ../plugins/patch/patch-plugin.c:271
 msgid "Patching complete"
 msgstr "������สร��สม�ูร��"
 
-#: ../plugins/patch/patch-plugin.glade.h:1
-#: ../plugins/subversion/anjuta-subversion.glade.h:31
+#: ../plugins/patch/patch-plugin.ui.h:1
+#: ../plugins/subversion/anjuta-subversion.ui.h:32
 msgid "Dry run"
 msgstr "�ำลอ����า�ั��"
 
-#: ../plugins/patch/patch-plugin.glade.h:2
+#: ../plugins/patch/patch-plugin.ui.h:2
 msgid "File/Directory to patch:"
 msgstr "���ม/���ร��อรี�ี��ะ�����:"
 
-#: ../plugins/patch/patch-plugin.glade.h:4
+#: ../plugins/patch/patch-plugin.ui.h:4
 msgid "Patch file:"
 msgstr "���ม�����:"
 
-#: ../plugins/patch/patch-plugin.glade.h:5
+#: ../plugins/patch/patch-plugin.ui.h:5
 msgid "Patch level:"
 msgstr "�วามลึ��อ��าร�����:"
 
@@ -6033,29 +6152,29 @@ msgid ""
 "Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
 msgstr "�ม�สามาร� checkout �า� uri \"%s\" �ี��ำห�� ��อ�ิ��ลา��ี����ือ: \"%s\""
 
-#: ../plugins/project-import/project-import.glade.h:1
+#: ../plugins/project-import/project-import.ui.h:1
 msgid "<b>Import options</b>"
 msgstr "<b>�ัว�ลือ��าร�ำ���า</b>"
 
-#: ../plugins/project-import/project-import.glade.h:2
+#: ../plugins/project-import/project-import.ui.h:2
 msgid "<b>Project name</b>"
 msgstr "<b>�ื�อ��ร��าร</b>"
 
-#: ../plugins/project-import/project-import.glade.h:3
+#: ../plugins/project-import/project-import.ui.h:3
 #: ../plugins/project-wizard/templates/translatable-strings.h:33
-#: ../plugins/subversion/anjuta-subversion.glade.h:26
+#: ../plugins/subversion/anjuta-subversion.ui.h:27
 msgid "Destination:"
 msgstr "�ลาย�า�:"
 
-#: ../plugins/project-import/project-import.glade.h:4
+#: ../plugins/project-import/project-import.ui.h:4
 msgid "Import from folder"
 msgstr "�ำ���า�า���ล��อร�"
 
-#: ../plugins/project-import/project-import.glade.h:5
+#: ../plugins/project-import/project-import.ui.h:5
 msgid "Import from version control system"
 msgstr "�ำ���า�า�ระ���ว��ุมรุ��"
 
-#: ../plugins/project-import/project-import.glade.h:6
+#: ../plugins/project-import/project-import.ui.h:6
 msgid "Location:"
 msgstr "�ำ�ห���:"
 
@@ -6067,51 +6186,51 @@ msgstr "�ำ���า��ร��าร"
 msgid "Import"
 msgstr "�ำ���า"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:1
+#: ../plugins/project-manager/create_dialogs.ui.h:1
 msgid "Add Source"
 msgstr "��ิ�ม�อร�ส"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:2
+#: ../plugins/project-manager/create_dialogs.ui.h:2
 msgid "New Group"
 msgstr "�ลุ�ม�หม�"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:3
+#: ../plugins/project-manager/create_dialogs.ui.h:3
 msgid "New Target"
 msgstr "���าหมาย�หม�"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:4
+#: ../plugins/project-manager/create_dialogs.ui.h:4
 msgid "Select the _target for the new source files:"
 msgstr "�ลือ��_��าหมายสำหรั����ม�อร�ส�หม�:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:5
+#: ../plugins/project-manager/create_dialogs.ui.h:5
 msgid "Source files:"
 msgstr "���ม�อร�ส:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:6
+#: ../plugins/project-manager/create_dialogs.ui.h:6
 msgid "Specify _where to create the group:"
 msgstr "ระ�ุ_�ี��ี��ะสร�า��ลุ�ม:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:7
+#: ../plugins/project-manager/create_dialogs.ui.h:7
 msgid "Specify _where to create the target:"
 msgstr "ระ�ุ_�ี��ี��ะสร�า����าหมาย:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:8
+#: ../plugins/project-manager/create_dialogs.ui.h:8
 msgid "Target _name:"
 msgstr "�ื�อ�_��าหมาย:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:9
+#: ../plugins/project-manager/create_dialogs.ui.h:9
 msgid "Target _type:"
 msgstr "_��ิ��อ����าหมาย:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:10
+#: ../plugins/project-manager/create_dialogs.ui.h:10
 msgid "TargetTypes"
 msgstr "��ิ����าหมาย"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:11
+#: ../plugins/project-manager/create_dialogs.ui.h:11
 msgid "_Group name:"
 msgstr "�ื�อ_�ลุ�ม:"
 
-#: ../plugins/project-manager/create_dialogs.glade.h:12
+#: ../plugins/project-manager/create_dialogs.ui.h:12
 msgid "_Select file to add..."
 msgstr "�_ลือ����ม�ี��ะ��ิ�ม..."
 
@@ -6131,38 +6250,34 @@ msgstr "อ�อ������ GbfProject"
 msgid "No project loaded"
 msgstr "�ม�มี�าร�หล���ร��าร"
 
-#: ../plugins/project-manager/gbf-project-util.c:81
-msgid "Couldn't load glade file"
-msgstr "�ม�สามาร��หล����ม glade ���"
-
-#: ../plugins/project-manager/gbf-project-util.c:260
-#: ../plugins/project-manager/gbf-project-util.c:268
+#: ../plugins/project-manager/gbf-project-util.c:236
+#: ../plugins/project-manager/gbf-project-util.c:244
 msgid "Can not add group"
 msgstr "�ม�สามาร���ิ�ม�ลุ�ม"
 
-#: ../plugins/project-manager/gbf-project-util.c:269
+#: ../plugins/project-manager/gbf-project-util.c:245
 msgid "No parent group selected"
 msgstr "�ม�มี�าร�ลือ��ลุ�ม�ม�"
 
-#: ../plugins/project-manager/gbf-project-util.c:441
-#: ../plugins/project-manager/gbf-project-util.c:450
+#: ../plugins/project-manager/gbf-project-util.c:417
+#: ../plugins/project-manager/gbf-project-util.c:426
 msgid "Can not add target"
 msgstr "�ม�สามาร���ิ�ม���าหมาย"
 
-#: ../plugins/project-manager/gbf-project-util.c:451
+#: ../plugins/project-manager/gbf-project-util.c:427
 msgid "No group selected"
 msgstr "�ม�มี�าร�ลือ��ลุ�ม"
 
-#: ../plugins/project-manager/gbf-project-util.c:556
+#: ../plugins/project-manager/gbf-project-util.c:532
 msgid "Select sources..."
 msgstr "�ลือ��อร�ส..."
 
-#: ../plugins/project-manager/gbf-project-util.c:796
-#: ../plugins/project-manager/gbf-project-util.c:803
+#: ../plugins/project-manager/gbf-project-util.c:772
+#: ../plugins/project-manager/gbf-project-util.c:779
 msgid "Can not add source files"
 msgstr "�ม�สามาร���ิ�ม���ม�อร�ส"
 
-#: ../plugins/project-manager/gbf-project-util.c:804
+#: ../plugins/project-manager/gbf-project-util.c:780
 msgid "No target has been selected"
 msgstr "�ม�มี�าร�ลือ����าหมาย"
 
@@ -6991,27 +7106,27 @@ msgstr "gtk-doc �ะ�ู�������าร�อม��ล��
 msgid "project name"
 msgstr "�ื�อ��ร��าร"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:2
+#: ../plugins/run-program/anjuta-run-program.ui.h:2
 msgid "Choose a working directory"
 msgstr "�ลือ����ร��อรี�ำ�า�"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:3
+#: ../plugins/run-program/anjuta-run-program.ui.h:3
 msgid "Environment Variables:"
 msgstr "�ัว��รสภา��ว�ล�อม:"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:4
+#: ../plugins/run-program/anjuta-run-program.ui.h:4
 msgid "Program Parameters"
 msgstr "�ารามิ��อร��อ���ร��รม"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:5
+#: ../plugins/run-program/anjuta-run-program.ui.h:5
 msgid "Program:"
 msgstr "��ร��รม:"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:6
+#: ../plugins/run-program/anjuta-run-program.ui.h:6
 msgid "Run In Terminal"
 msgstr "�รีย�����อร�มิ�ัล"
 
-#: ../plugins/run-program/anjuta-run-program.glade.h:7
+#: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "���ร��อรี�ำ�า�:"
 
@@ -7030,7 +7145,7 @@ msgstr "���ร��อรี��ร��รม '%s' �ม����
 msgid "Load Target to run"
 msgstr "�หล����าหมาย�ี��ะ�รีย��ำ�า�"
 
-#: ../plugins/run-program/parameters.c:732
+#: ../plugins/run-program/parameters.c:736
 #: ../plugins/search/search_preferences.c:534
 msgid "Name"
 msgstr "�ื�อ"
@@ -7078,181 +7193,176 @@ msgstr "�ั����า��ร��รม�ั��ุ�ั� อ
 msgid "Run operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��าร�รีย��ำ�า�"
 
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:1
-msgid "<b>Scratchbox Options</b>\n"
-msgstr "<b>�ัว�ลือ��อ� Scratchbox</b>\n"
+#: ../plugins/search/anjuta-search.ui.h:1
+msgid "*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp"
+msgstr "*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp"
 
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:3
-msgid "Scratchbox directory:"
-msgstr "���ร��อรี Scratchbox:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:4
-msgid "Scratchbox target:"
-msgstr "���าหมาย Scratchbox:"
-
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:5
-msgid "Scratchbox version:"
-msgstr "รุ���อ� Scratchbox:"
+#: ../plugins/search/anjuta-search.ui.h:2
+msgid ""
+"*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README "
+"AUTHORS ChangeLog *.m4"
+msgstr ""
+"*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README "
+"AUTHORS ChangeLog *.m4"
 
-#: ../plugins/scratchbox/anjuta-scratchbox.glade.h:6
-msgid "Select Scratchbox Folder"
-msgstr "�ลือ���ล��อร� Scratchbox"
+#: ../plugins/search/anjuta-search.ui.h:3
+msgid "*.so *.o *.a *.la"
+msgstr "*.so *.o *.a *.la"
 
-#: ../plugins/scratchbox/plugin.c:458 ../plugins/scratchbox/plugin.c:480
-msgid "Scratchbox"
-msgstr "Scratchbox"
+#: ../plugins/search/anjuta-search.ui.h:4
+msgid "*\\.*"
+msgstr "*\\.*"
 
-#. Public functions
-#. *---------------------------------------------------------------------------
-#: ../plugins/search/anjuta-search.glade.h:1
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "<b>Actions</b>"
 msgstr "<b>�าร�ระ�ำ</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:2
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "<b>File Filter</b>"
 msgstr "<b>�ัว�รอ����ม</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:4
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "<b>Parameters</b>"
 msgstr "<b>�ารามิ��อร�</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:5
+#: ../plugins/search/anjuta-search.ui.h:9
 msgid "<b>Scope</b>"
 msgstr "<b>�อ����</b>"
 
-#. User can select variables that contain lists of files, so this is a combined noun
-#: ../plugins/search/anjuta-search.glade.h:7
+#: ../plugins/search/anjuta-search.ui.h:10
 msgid "<b>Search variable</b>"
 msgstr "<b>�ัว��ร�อ��าร���หา</b>"
 
-#: ../plugins/search/anjuta-search.glade.h:8
-#: ../plugins/search/search-replace.c:93
+#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "�อยหลั�"
 
-#: ../plugins/search/anjuta-search.glade.h:9
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Basic Search & Replace"
 msgstr "���หา�ละ����ี�����รรม�า"
 
-#: ../plugins/search/anjuta-search.glade.h:10
+#: ../plugins/search/anjuta-search.ui.h:14
+msgid "CVS intl po "
+msgstr "CVS intl po "
+
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Choose Directories:"
 msgstr "�ลือ����ร��อรี:"
 
-#: ../plugins/search/anjuta-search.glade.h:11
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Choose Files:"
 msgstr "�ลือ����ม:"
 
-#: ../plugins/search/anjuta-search.glade.h:12
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Expand regex back references"
 msgstr "�ยาย�ารอ�า�อิ��ลั����ิ�����ร�ิวลาร�"
 
-#: ../plugins/search/anjuta-search.glade.h:13
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Find & Replace"
 msgstr "หา�ละ����ี�"
 
-#: ../plugins/search/anjuta-search.glade.h:14
-#: ../plugins/search/search-replace.c:92
+#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/search-replace.c:91
 msgid "Forward"
 msgstr "����า�ห��า"
 
 #. the order of these matters - it must match the order of the corresponding
 #. radio buttons on another page
-#: ../plugins/search/anjuta-search.glade.h:15
-#: ../plugins/search/search-replace.c:91
+#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
 msgstr "���ม�ั���อร�"
 
-#: ../plugins/search/anjuta-search.glade.h:16
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Greedy matching"
 msgstr "���หา����ั��ู�มา��ี�สุ�"
 
-#: ../plugins/search/anjuta-search.glade.h:17
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Ignore Binary Files"
 msgstr "ละ�ลย���ม���ารี"
 
-#: ../plugins/search/anjuta-search.glade.h:18
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "Ignore Directories:"
 msgstr "ละ�ลย���ร��อรี:"
 
-#: ../plugins/search/anjuta-search.glade.h:19
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "Ignore Files:"
 msgstr "ละ�ลย���ม:"
 
-#: ../plugins/search/anjuta-search.glade.h:20
+#: ../plugins/search/anjuta-search.ui.h:25
 msgid "Ignore Hidden Directories"
 msgstr "ละ�ลย���ร��อรี��อ�"
 
-#: ../plugins/search/anjuta-search.glade.h:21
+#: ../plugins/search/anjuta-search.ui.h:26
 msgid "Ignore Hidden Files"
 msgstr "ละ�ลย���ม��อ�"
 
-#: ../plugins/search/anjuta-search.glade.h:22
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Match at start of word"
 msgstr "�ั��ู��ี�����ำ"
 
-#: ../plugins/search/anjuta-search.glade.h:24
+#: ../plugins/search/anjuta-search.ui.h:29
 msgid "Match complete lines"
 msgstr "�ั��ู��ั���รร�ั�"
 
-#: ../plugins/search/anjuta-search.glade.h:25
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Match complete words"
 msgstr "�ั��ู��ั���ำ"
 
-#: ../plugins/search/anjuta-search.glade.h:26
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Maximum Actions"
 msgstr "�าร�ระ�ำสู�สุ�"
 
-#: ../plugins/search/anjuta-search.glade.h:27
+#: ../plugins/search/anjuta-search.ui.h:32
 msgid "Modify"
 msgstr "�รั���ลี�ย�"
 
-#: ../plugins/search/anjuta-search.glade.h:28
+#: ../plugins/search/anjuta-search.ui.h:33
 msgid "New Name:"
 msgstr "�ื�อ�หม�:"
 
-#: ../plugins/search/anjuta-search.glade.h:29
+#: ../plugins/search/anjuta-search.ui.h:34
 msgid "No Limit"
 msgstr "�ม��ำ�ั�"
 
-#: ../plugins/search/anjuta-search.glade.h:30
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Regular expression"
 msgstr "�ิ�����ร�ิวลาร�"
 
-#: ../plugins/search/anjuta-search.glade.h:31
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Replace With:"
 msgstr "����ี���วย:"
 
-#: ../plugins/search/anjuta-search.glade.h:32
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Action:"
 msgstr "�าร�ระ�ำ��ะ���หา:"
 
-#: ../plugins/search/anjuta-search.glade.h:33
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Search Direction:"
 msgstr "�ิศ�า��าร���หา:"
 
-#. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.glade.h:35
+#: ../plugins/search/anjuta-search.ui.h:39
 msgid "Search Expression"
 msgstr "�ิ�������หา"
 
-#. This is "the search expression" (noun)
-#: ../plugins/search/anjuta-search.glade.h:37
+#: ../plugins/search/anjuta-search.ui.h:40
 msgid "Search Expression:"
 msgstr "�ิ�������หา:"
 
-#: ../plugins/search/anjuta-search.glade.h:38
+#: ../plugins/search/anjuta-search.ui.h:41
 msgid "Search In:"
 msgstr "���หา��:"
 
-#: ../plugins/search/anjuta-search.glade.h:39
+#: ../plugins/search/anjuta-search.ui.h:42
 msgid "Search Recursively"
 msgstr "���หา�����ร��อรีย�อย��วย"
 
-#: ../plugins/search/anjuta-search.glade.h:40
+#: ../plugins/search/anjuta-search.ui.h:43
 msgid "Search Target"
 msgstr "���าหมาย�าร���หา"
 
-#: ../plugins/search/anjuta-search.glade.h:41
+#: ../plugins/search/anjuta-search.ui.h:44
 msgid "Setting"
 msgstr "�าร�ำห����า"
 
@@ -7305,92 +7415,92 @@ msgstr "�าร���หา..."
 msgid "Basic Search"
 msgstr "�าร���หา��ื�อ����"
 
-#: ../plugins/search/search-replace.c:98
+#: ../plugins/search/search-replace.c:97
 msgid "Current Buffer"
 msgstr "�ั���อร��ั��ุ�ั�"
 
-#: ../plugins/search/search-replace.c:99
+#: ../plugins/search/search-replace.c:98
 msgid "Current Selection"
 msgstr "สิ���ี��ลือ��ั��ุ�ั�"
 
-#: ../plugins/search/search-replace.c:100
+#: ../plugins/search/search-replace.c:99
 msgid "Current Block"
 msgstr "�ล�อ��ั��ุ�ั�"
 
-#: ../plugins/search/search-replace.c:101
+#: ../plugins/search/search-replace.c:100
 msgid "Current Function"
 msgstr "�ั����ั��ั��ุ�ั�"
 
-#: ../plugins/search/search-replace.c:102
+#: ../plugins/search/search-replace.c:101
 msgid "All Open Buffers"
 msgstr "�ั���อร��ี���ิ�อยู��ั��หม�"
 
-#: ../plugins/search/search-replace.c:103
+#: ../plugins/search/search-replace.c:102
 msgid "All Project Files"
 msgstr "���ม��ร��าร�ั��หม�"
 
 #. {SR_VARIABLE, N_("Specify File List")},
-#: ../plugins/search/search-replace.c:105
+#: ../plugins/search/search-replace.c:104
 msgid "Specify File Patterns"
 msgstr "ระ�ุ�����ิร���อ����ม"
 
-#: ../plugins/search/search-replace.c:110
+#: ../plugins/search/search-replace.c:109
 msgid "Select next match"
 msgstr "�ลือ���อ�วาม�ั����ึ��ร��ั�"
 
-#: ../plugins/search/search-replace.c:111
+#: ../plugins/search/search-replace.c:110
 msgid "Bookmark all matched lines"
 msgstr "�ั���ุ��รร�ั��ี��ร�"
 
-#: ../plugins/search/search-replace.c:112
+#: ../plugins/search/search-replace.c:111
 msgid "Mark all matches"
 msgstr "�ำ��รื�อ�หมาย��อ�วาม�ี��ร��ั��หม�"
 
-#: ../plugins/search/search-replace.c:113
+#: ../plugins/search/search-replace.c:112
 msgid "List matches in find pane"
 msgstr "�ส��ราย�ื�อ��อ�วาม�ี��ร�����อ����หา"
 
-#: ../plugins/search/search-replace.c:114
+#: ../plugins/search/search-replace.c:113
 msgid "Replace next match"
 msgstr "����ี���อ�วาม�ั����ี��ร��ั�"
 
-#: ../plugins/search/search-replace.c:115
+#: ../plugins/search/search-replace.c:114
 msgid "Replace all matches"
 msgstr "����ี���อ�วาม�ี��ร��ั��หม�"
 
 #. Avoid space in translated string
-#: ../plugins/search/search-replace.c:320
+#: ../plugins/search/search-replace.c:319
 msgid "Find:"
 msgstr "หา:"
 
-#: ../plugins/search/search-replace.c:502
+#: ../plugins/search/search-replace.c:501
 msgid "Replace"
 msgstr "����ี�"
 
-#: ../plugins/search/search-replace.c:631
+#: ../plugins/search/search-replace.c:630
 msgid "Search complete"
 msgstr "���หา�สร��สม�ูร��"
 
-#: ../plugins/search/search-replace.c:1038
-#: ../plugins/search/search-replace.c:1722
+#: ../plugins/search/search-replace.c:1037
+#: ../plugins/search/search-replace.c:1724
 msgid "Replace All"
 msgstr "����ี��ั��หม�"
 
-#: ../plugins/search/search-replace.c:1077
+#: ../plugins/search/search-replace.c:1076
 #, c-format
 msgid "The match \"%s\" was not found. Wrap search around the document?"
 msgstr "�ม�����อ�วาม \"%s\" �ี��ร� �ะว��อ�สารหา�หม�หรือ�ม�?"
 
-#: ../plugins/search/search-replace.c:1097
+#: ../plugins/search/search-replace.c:1096
 #, c-format
 msgid "The match \"%s\" was not found."
 msgstr "�ม�����อ�วาม \"%s\" �ี��ร�"
 
-#: ../plugins/search/search-replace.c:1112
+#: ../plugins/search/search-replace.c:1111
 msgid "The maximum number of results has been reached."
 msgstr "�ำ�ว��ลลั�����ิ���าสู�สุ��ี��ำห���ว�"
 
-#: ../plugins/search/search-replace.c:1125
+#: ../plugins/search/search-replace.c:1124
 #, c-format
 msgid "%d match has been replaced."
 msgid_plural "%d matches have been replaced."
@@ -7449,6 +7559,94 @@ msgstr "���ม�หม� %d"
 msgid "Preparing pages for printing"
 msgstr "�ำลั���รียมห��าสำหรั��ิม��"
 
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:1
+msgid "<b>Color scheme:</b>"
+msgstr "<b>�ุ�สี:</b>"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:2
+msgid "<b>Font:</b>"
+msgstr "<b>���อั�ษร:</b>"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
+msgid "<b>Indentation and auto-format options</b>"
+msgstr "<b>�ัว�ลือ��ารร��ย�อห��า�ละรู����อั���มั�ิ</b>"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
+msgid "<b>Print options</b>"
+msgstr "<b>�ัว�ลือ�สำหรั��าร�ิม��</b>"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
+msgid "<b>View</b>"
+msgstr "<b>มุมมอ�</b>"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
+msgid "Create backup files"
+msgstr "สร�า����มสำรอ�"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
+msgid "Font"
+msgstr "���อั�ษร"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
+msgid "Highlight current line"
+msgstr "�����รร�ั��ั��ุ�ั�"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
+msgid "Highlight matching brackets"
+msgstr "����ว��ล���ี����า�ู�"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+msgid "Highlight syntax"
+msgstr "�����วยา�ร��"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
+msgid "Print Linenumbers"
+msgstr "�ิม���ล��รร�ั�"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
+msgid "Print page footer"
+msgstr "�ิม����าย�ระ�าษ"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
+msgid "Print page header"
+msgstr "�ิม��หัว�ระ�าษ"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
+msgid "Printing"
+msgstr "�าร�ิม��"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
+msgid "Right margin position in characters"
+msgstr "�ำ�ห����อ��วา�����ำ�ว��ัวอั�ษร"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
+msgid "Show line numbers"
+msgstr "�ส���ล��รร�ั�"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+msgid "Show marks"
+msgstr "�ส���อ��ำ��รื�อ�หมาย"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+msgid "Show right margin"
+msgstr "�ส���ั��ห��า�วา"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+msgid "Tab size in spaces:"
+msgstr "��า����������ำ�ว���อ�ว�า�:"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
+msgid "Use tabs for indentation"
+msgstr "����������ารร��ย�อห��า"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+msgid "Use theme font"
+msgstr "������อั�ษร�อ��ีม"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
+msgid "Wrap long lines to fit on paper"
+msgstr "�ั��รร�ั�ยาว�ห��อ�ีห��า�ระ�าษ"
+
 #: ../plugins/starter/plugin.c:50 ../plugins/starter/starter.c:344
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
@@ -7478,159 +7676,167 @@ msgstr "�ู�มือ�อ��ู�า"
 msgid "Gnome Online API Documentation"
 msgstr "�อ�สาร API ออ��ล���อ� GNOME"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:1
+#: ../plugins/subversion/anjuta-subversion.ui.h:1
 msgid "<b>Branch/Tag URL:</b>"
 msgstr "<b>URL �อ�����/����:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:3
+#: ../plugins/subversion/anjuta-subversion.ui.h:3
 msgid "<b>End Revision:</b>"
 msgstr "<b>��ั������สุ���าย:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:4
+#: ../plugins/subversion/anjuta-subversion.ui.h:4
 msgid "<b>File or directory to diff:</b>"
 msgstr "<b>���มหรือ���ร��อรี�ี��ะ diff:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:5
+#: ../plugins/subversion/anjuta-subversion.ui.h:5
 msgid "<b>File/URL to Remove:</b>"
 msgstr "<b>���ม/URL �ี��ะล�:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:6
+#: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "<b>First Path:</b>"
 msgstr "<b>�า��ร�:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:11
+#: ../plugins/subversion/anjuta-subversion.ui.h:10
+msgid "<b>Previous Commit Messages:</b>"
+msgstr "<b>��อ�วาม commit �รั���ี��ล�ว:</b>"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:12
 msgid "<b>Second Path:</b>"
 msgstr "<b>�า��ี�สอ�:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:12
+#: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "<b>Select Changes to Revert:</b>"
 msgstr "<b>�ลือ��าร��ลี�ย���ล��ี��ะย�อ��ื�:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:15
+#: ../plugins/subversion/anjuta-subversion.ui.h:16
 msgid "<b>Source/Destination Paths:</b>"
 msgstr "<b>�า�����า�/�ลาย�า�:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:16
+#: ../plugins/subversion/anjuta-subversion.ui.h:17
 msgid "<b>Start Revision:</b>"
 msgstr "<b>��ั�������ริ�ม���:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:17
+#: ../plugins/subversion/anjuta-subversion.ui.h:18
 msgid "<b>Subversion Options</b>"
 msgstr "<b>�ัว�ลือ�สำหรั� Subversion</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:19
+#: ../plugins/subversion/anjuta-subversion.ui.h:20
 msgid "<b>Working Copy Path:</b>"
 msgstr "<b>�า�สำ��า�ุ��ี��ำ�า�:</b>"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:20
+#: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Add file/directory"
 msgstr "��ิ�ม���ม/���ร��อรี"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:25
+#: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Copy files/folders"
 msgstr "�ั�ลอ����ม/��ล��อร�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:27
+#: ../plugins/subversion/anjuta-subversion.ui.h:28
 msgid "Diff Selected Revisions"
 msgstr "Diff ��ั�������ี��ลือ�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:28
+#: ../plugins/subversion/anjuta-subversion.ui.h:29
 msgid "Diff file/directory"
 msgstr "Diff ���ม/���ร��อรี"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:29
+#: ../plugins/subversion/anjuta-subversion.ui.h:30
 msgid "Diff to Previous"
 msgstr "Diff �ั���ั���อ�ห��า"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:33
+#: ../plugins/subversion/anjuta-subversion.ui.h:34
 msgid "Ignore ancestry"
 msgstr "�ม���อ�ส���สาย�ระวั�ิ"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:34
+#: ../plugins/subversion/anjuta-subversion.ui.h:35
 msgid "Merge changes into working copy"
 msgstr "�สา��าร��ลี�ย���ล����า���ุ�สำ��า�ำ�า�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:35
+#: ../plugins/subversion/anjuta-subversion.ui.h:36
 msgid "Other Revision:"
 msgstr "��ั������อื���:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:37
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Realm:"
 msgstr "�อ����:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
 msgid "Recurse"
 msgstr "�ั��ยว�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
 msgid "Remember Password"
 msgstr "�ำรหัส��า�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
 msgid "Remember this decision"
 msgstr "�ำ�ำ�อ��ี�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:41
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
 msgid "Remove file/directory"
 msgstr "ล����ม/���ร��อรี"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:42
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
 msgid "Repository Head"
 msgstr "Head �อ��ลั�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:43
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
 msgid "Repository authorization"
 msgstr "�าร�รว�สอ�สิ��ิ��อ��ลั�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
 msgid "Revert Changes"
 msgstr "�รีย��าร��ลี�ย���ล��ื�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:47
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
 msgid "Save open files before diffing"
 msgstr "�ั��ึ����ม�ี���ิ���อ� diff"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Source:"
 msgstr "����า�:"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Subversion Preferences"
 msgstr "�รั����� Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Switch to branch/tag"
 msgstr "สลั���������/����"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
 msgid "Trust server"
 msgstr "��ื�อ�ือ��ิร���วอร�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
 msgid "Update file/directory"
 msgstr "�รั���อมูล���ม/���ร��อรี"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Use first path"
 msgstr "����า��ร�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
+msgid "Use previous message"
+msgstr "�����อ�วาม�ี��ล�ว"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View Log"
 msgstr "�ู�ูม"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:58
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "View Selected Revision"
 msgstr "�ู��ั�������ี��ลือ�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole Project"
 msgstr "�ั����ร��าร"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
 msgid "Working Copy"
 msgstr "สำ��า�ุ��ี��ำ�า�"
 
-#: ../plugins/subversion/anjuta-subversion.glade.h:62
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
 msgstr "�อ����"
 
@@ -7766,15 +7972,15 @@ msgstr "�ั�ลอ�..."
 msgid "Diff..."
 msgstr "Diff..."
 
-#: ../plugins/subversion/plugin.c:454
+#: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั� subversion"
 
-#: ../plugins/subversion/plugin.c:460
+#: ../plugins/subversion/plugin.c:494
 msgid "Subversion popup operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั� subversion ���ม�ู�ุ��ึ��"
 
-#: ../plugins/subversion/plugin.c:488
+#: ../plugins/subversion/plugin.c:526
 msgid "Subversion Log"
 msgstr "�ูม�อ� Subversion"
 
@@ -7786,7 +7992,7 @@ msgstr "Subversion: ���ม�ะ�ู���ิ�ม���าร co
 msgid "Subversion: Commit complete."
 msgstr "Subversion: commit �สร��สม�ูร��"
 
-#: ../plugins/subversion/subversion-commit-dialog.c:93
+#: ../plugins/subversion/subversion-commit-dialog.c:123
 msgid "Subversion: Committing changes to the repository..."
 msgstr "Subversion: �ำลั� commit �าร��ลี�ย���ล����ี��ลั�..."
 
@@ -7895,83 +8101,83 @@ msgstr "Subversion: Diff �สร��สม�ูร��"
 msgid "Subversion: Update complete."
 msgstr "Subversion: �รั���อมูล�สร��สม�ูร��"
 
-#: ../plugins/subversion/svn-command.c:145
-#: ../plugins/subversion/svn-command.c:201
+#: ../plugins/subversion/svn-command.c:158
+#: ../plugins/subversion/svn-command.c:225
 msgid "Authentication canceled"
 msgstr "�ารยื�ยั��ัว�ุ��ล�ู�ย��ลิ�"
 
-#: ../plugins/subversion/svn-command.c:174
+#: ../plugins/subversion/svn-command.c:198
 msgid "Hostname:"
 msgstr "�ื�อ�ฮส��:"
 
-#: ../plugins/subversion/svn-command.c:175
+#: ../plugins/subversion/svn-command.c:199
 msgid "Fingerprint:"
 msgstr "ลาย�ิ�วมือ:"
 
-#: ../plugins/subversion/svn-command.c:176
+#: ../plugins/subversion/svn-command.c:200
 msgid "Valid from:"
 msgstr "�������ั�����:"
 
-#: ../plugins/subversion/svn-command.c:177
+#: ../plugins/subversion/svn-command.c:201
 msgid "Valid until:"
 msgstr "�������ึ�:"
 
-#: ../plugins/subversion/svn-command.c:178
+#: ../plugins/subversion/svn-command.c:202
 msgid "Issuer DN:"
 msgstr "DN �อ��ู�ออ��ห�:"
 
-#: ../plugins/subversion/svn-command.c:179
+#: ../plugins/subversion/svn-command.c:203
 msgid "DER certificate:"
 msgstr "��รั�รอ���� DER:"
 
-#: ../plugins/subversion/svn-command.c:326
-#: ../plugins/subversion/svn-command.c:342
+#: ../plugins/subversion/svn-command.c:350
+#: ../plugins/subversion/svn-command.c:366
 #, c-format
 msgid "Deleted: %s"
 msgstr "ล��ล�ว: %s"
 
-#: ../plugins/subversion/svn-command.c:329
-#: ../plugins/subversion/svn-command.c:348
+#: ../plugins/subversion/svn-command.c:353
+#: ../plugins/subversion/svn-command.c:372
 #, c-format
 msgid "Added: %s"
 msgstr "��ิ�ม�ล�ว: %s"
 
-#: ../plugins/subversion/svn-command.c:339
+#: ../plugins/subversion/svn-command.c:363
 #, c-format
 msgid "Resolved: %s"
 msgstr "������ล�ว: %s"
 
-#: ../plugins/subversion/svn-command.c:345
+#: ../plugins/subversion/svn-command.c:369
 #, c-format
 msgid "Updated: %s"
 msgstr "�รั���อมูล�ล�ว: %s"
 
-#: ../plugins/subversion/svn-command.c:351
+#: ../plugins/subversion/svn-command.c:375
 #, c-format
 msgid "Externally Updated: %s"
 msgstr "�รั���อมูลภาย�อ��ล�ว: %s"
 
-#: ../plugins/subversion/svn-command.c:385
+#: ../plugins/subversion/svn-command.c:409
 #, c-format
 msgid "Modified: %s"
 msgstr "มี�าร��ลี�ย���ล�: %s"
 
-#: ../plugins/subversion/svn-command.c:388
+#: ../plugins/subversion/svn-command.c:412
 #, c-format
 msgid "Merged: %s"
 msgstr "�สา��ล�ว: %s"
 
-#: ../plugins/subversion/svn-command.c:391
+#: ../plugins/subversion/svn-command.c:415
 #, c-format
 msgid "Conflicted: %s"
 msgstr "�ั��ย��: %s"
 
-#: ../plugins/subversion/svn-command.c:395
+#: ../plugins/subversion/svn-command.c:419
 #, c-format
 msgid "Missing: %s"
 msgstr "สู�หาย: %s"
 
-#: ../plugins/subversion/svn-command.c:398
+#: ../plugins/subversion/svn-command.c:422
 #, c-format
 msgid "Obstructed: %s"
 msgstr "�ู��ี��วา�: %s"
@@ -8024,10 +8230,6 @@ msgstr "ส����ล�ว %d �า� %d ���ม"
 msgid "Populating symbols' db..."
 msgstr "�ำลั���ิม��อมูล�า���อมูลสั�ลั�ษ��..."
 
-#: ../plugins/symbol-db/plugin.c:2228
-msgid "Local"
-msgstr "���าะ�ี�"
-
 #: ../plugins/symbol-db/plugin.c:2254
 msgid "Global"
 msgstr "ส�ว��ลา�"
@@ -8049,12 +8251,12 @@ msgid "Package is not parseable"
 msgstr "�������ม�สามาร�������"
 
 #: ../plugins/symbol-db/symbol-db-prefs.c:369
-#: ../plugins/symbol-db/symbol-db-prefs.c:510
+#: ../plugins/symbol-db/symbol-db-prefs.c:516
 #: ../plugins/symbol-db/symbol-db.plugin.in.h:1
 msgid "Symbol Database"
 msgstr "�า���อมูลสั�ลั�ษ��"
 
-#: ../plugins/symbol-db/symbol-db-prefs.c:459
+#: ../plugins/symbol-db/symbol-db-prefs.c:465
 msgid "API Tags"
 msgstr "���� API"
 
@@ -8067,47 +8269,61 @@ msgstr "�าร�ลั���ส��� glb �หม�"
 msgid "Symbol"
 msgstr "สั�ลั�ษ��"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:1
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
 msgid "<b>Available API tags</b>"
 msgstr "<b>���� API �ี�มีอยู�</b>"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:3
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
 msgid "Automatically scan project's packages"
 msgstr "�รว���อมูล�������อ���ร��าร��ยอั���มั�ิ"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:4
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
 msgid "Automatically update symbols without saving file"
 msgstr "�รั���อมูลสั�ลั�ษ����ยอั���มั�ิ��ย�ม��ั��ึ����ม"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:5
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
 msgid "Checking if package is parseable..."
 msgstr "�ำลั��รว�สอ�ว�า������สามาร�������หรือ�ม�..."
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:6
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Ctags executable:"
 msgstr "���ม��ร��รม Ctags:"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.glade.h:7
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "�รว���อมูล��ร��าร�ละสั�ลั�ษ��ส�ว��ลา������า�"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>�ัว�ลือ�สำหรั���อร�มิ�ัล</b>"
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
+msgid ""
+"This option enables the default packages required by your opened project, e."
+"g. glib and gtk+ if you create a Gtk+ project (may require more cpu work)"
+msgstr ""
+"�ัว�ลือ��ี���ิ�����������ริยาย�ี���ร��าร�ี��ุ���ิ�อยู���อ���� ���� glib �ละ gtk+ "
+"��า�ุ�สร�า���ร��าร Gtk+ (อา��ำ�ห��ี�ียู�ำ�า�ห�ั��ึ��)"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:2
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
 msgid ""
-"Default\n"
-"\n"
+"This option means that the global system packages will be scanned "
+"contemporary with the project's ones"
+msgstr "�ัว�ลือ��ี��ะ�รว���อมูล������ส�ว��ลา��ร�อม � �ั��อ���ร��าร"
+
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:10
+msgid ""
+"Update automatically the file's symbols without saving. The update occurs "
+"after 10 seconds of no keypress by user."
 msgstr ""
-"�ริยาย\n"
-"\n"
+"�รั���อมูลสั�ลั�ษ���อ����ม��ยอั���มั�ิ��ย�ม��ั��ึ� �าร�รั���อมูล�ะ��ิ��ึ��หลั��า��ี��ู�����ม����ุ�ม�� � "
+"�����วลา 10 วิ�า�ี"
+
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
+msgid "<b>Terminal options</b>"
+msgstr "<b>�ัว�ลือ�สำหรั���อร�มิ�ัล</b>"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:5
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
 msgid "Use GNOME terminal profile:"
 msgstr "�����ร��ล���อร�มิ�ัล�อ� GNOME:"
 
-#: ../plugins/terminal/anjuta-terminal-plugin.glade.h:6
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "�����ร��ล��ี��ลือ��ว�����อร�มิ�ัล GNOME"
 
@@ -8115,68 +8331,65 @@ msgstr "�����ร��ล��ี��ลือ��ว����
 msgid "terminal operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���อร�มิ�ัล"
 
-#: ../plugins/terminal/terminal.c:719 ../plugins/terminal/terminal.c:877
-#: ../plugins/terminal/terminal.c:930
+#: ../plugins/terminal/terminal.c:719 ../plugins/terminal/terminal.c:886
+#: ../plugins/terminal/terminal.c:939
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "��อร�มิ�ัล"
 
-#: ../plugins/tools/anjuta-tools.glade.h:1
+#: ../plugins/tools/anjuta-tools.ui.h:1
 msgid "<b>Tools</b>"
 msgstr "<b>��รื�อ�มือ</b>"
 
-#: ../plugins/tools/anjuta-tools.glade.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Command:"
 msgstr "�ำสั��:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit as script"
 msgstr "�����ส�ริ���"
 
-#: ../plugins/tools/anjuta-tools.glade.h:5
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Edit command as script in Anjuta on close"
 msgstr "������ำสั�������ส�ริ������อ��ู�า�มื�อ�ิ�"
 
-#: ../plugins/tools/anjuta-tools.glade.h:8
+#: ../plugins/tools/anjuta-tools.ui.h:8
 msgid "Parameters:"
 msgstr "�ารามิ��อร�:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Save all files"
 msgstr "�ั��ึ����ม�ั��หม�"
 
-#: ../plugins/tools/anjuta-tools.glade.h:11
+#: ../plugins/tools/anjuta-tools.ui.h:11
 msgid "Short cut:"
 msgstr "�ุ�มลั�:"
 
-#. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:13
+#: ../plugins/tools/anjuta-tools.ui.h:12
 msgid "Standard error:"
 msgstr "��อ���อ�ิ��ลา�มา�ร�า�:"
 
-#. This is the Unix stdin. See http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:15
+#: ../plugins/tools/anjuta-tools.ui.h:13
 msgid "Standard input:"
 msgstr "อิ��ุ�มา�ร�า�:"
 
-#. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.glade.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:14
 msgid "Standard output:"
 msgstr "�อา���ุ�มา�ร�า�:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:15
 msgid "Tool Editor"
 msgstr "��รื�อ�มือ�������รื�อ�มือ"
 
-#: ../plugins/tools/anjuta-tools.glade.h:19
+#: ../plugins/tools/anjuta-tools.ui.h:16
 msgid "Variable list"
 msgstr "ราย�ื�อ�ัว��ร"
 
-#: ../plugins/tools/anjuta-tools.glade.h:20
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Working directory:"
 msgstr "���ร��อรี�ำ�า�:"
 
-#: ../plugins/tools/anjuta-tools.glade.h:21
+#: ../plugins/tools/anjuta-tools.ui.h:18
 msgid "_Variable..."
 msgstr "_�ัว��ร..."
 
@@ -8189,53 +8402,53 @@ msgstr "ยื�ยั�ว�า��อ��ารล���รื�อ
 msgid "Tool"
 msgstr "��รื�อ�มือ"
 
-#: ../plugins/tools/editor.c:309
+#: ../plugins/tools/editor.c:308
 msgid "ask at runtime"
 msgstr "�าม��ะ�ำ�า�"
 
-#: ../plugins/tools/editor.c:314
+#: ../plugins/tools/editor.c:313
 msgid "undefined"
 msgstr "�ม�����ำห���ว�"
 
-#: ../plugins/tools/editor.c:448
+#: ../plugins/tools/editor.c:450
 msgid "Unable to build user interface for tool variable"
 msgstr "�ม�สามาร�สร�า�ส�ว��ิ���อ�ู����สำหรั��ัว��ร�อ���รื�อ�มือ"
 
-#: ../plugins/tools/editor.c:464
+#: ../plugins/tools/editor.c:466
 msgid "Meaning"
 msgstr "�วามหมาย"
 
-#: ../plugins/tools/editor.c:564
+#: ../plugins/tools/editor.c:565
 msgid "Disabled"
 msgstr "�ิ�����า�"
 
-#: ../plugins/tools/editor.c:730
+#: ../plugins/tools/editor.c:731
 msgid "You must provide a tool name!"
 msgstr "�ุ���อ��ั���ื�อ��รื�อ�มือ!"
 
-#: ../plugins/tools/editor.c:738
+#: ../plugins/tools/editor.c:739
 msgid "You must provide a tool command!"
 msgstr "�ุ���อ��ำห���ำสั����รื�อ�มือ!"
 
-#: ../plugins/tools/editor.c:746
+#: ../plugins/tools/editor.c:747
 msgid "A tool with the same name already exists!"
 msgstr "มี��รื�อ�มือ�ื�อ��ียว�ั�อยู���อ��ล�ว!"
 
-#: ../plugins/tools/editor.c:763
+#: ../plugins/tools/editor.c:764
 msgid ""
 "The shortcut is already used by another component in Anjuta. Do you want to "
 "keep it anyway?"
 msgstr "�ุ�มลั��ี��ู�������ล�ว��ยอ����ระ�อ�อื�����อ��ู�า �ุ�ยั���อ��าร�����ว�หรือ�ม�?"
 
-#: ../plugins/tools/editor.c:847
+#: ../plugins/tools/editor.c:848
 msgid "Unable to edit script"
 msgstr "�ม�สามาร������ส�ริ���"
 
-#: ../plugins/tools/editor.c:983
+#: ../plugins/tools/editor.c:984
 msgid "New accelerator..."
 msgstr "�ีย���ว��หม�..."
 
-#: ../plugins/tools/editor.c:1053
+#: ../plugins/tools/editor.c:1056
 msgid "Unable to build user interface for tool editor"
 msgstr "�ม�สามาร�สร�า�ส�ว��ิ���อ�ู����สำหรั���รื�อ�มือ�������รื�อ�มือ"
 
@@ -8306,7 +8519,7 @@ msgstr "�ม�สามาร���ิ� %s ��ื�อ��ีย
 msgid "Tool operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���รื�อ�มือ"
 
-#: ../plugins/tools/plugin.c:252 ../plugins/tools/plugin.c:259
+#: ../plugins/tools/plugin.c:256 ../plugins/tools/plugin.c:263
 #: ../plugins/tools/anjuta-tools.plugin.in.h:1
 msgid "Tools"
 msgstr "��รื�อ�มือ"
@@ -8380,80 +8593,6 @@ msgstr "Copyright (c) Naba Kumar"
 msgid "Loaded Session..."
 msgstr "�หล�วาระ�ล�ว..."
 
-#: ../src/anjuta.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>ลั�ษ�ะ�รา��</b>"
-
-#: ../src/anjuta.glade.h:2
-msgid "<b>Project Defaults</b>"
-msgstr "<b>��า�ริยาย�อ���ร��าร</b>"
-
-#: ../src/anjuta.glade.h:3
-msgid "<b>Session</b>"
-msgstr "<b>วาระ</b>"
-
-#: ../src/anjuta.glade.h:4
-msgid ""
-"Default\n"
-"Text below icons\n"
-"Text beside icons\n"
-"Icons only\n"
-"Text only"
-msgstr ""
-"��ย�ริยาย\n"
-"��อ�วาม����อ�อ�\n"
-"��อ�วาม��า��อ�อ�\n"
-"�อ�อ����า�ั��\n"
-"��อ�วาม���า�ั��"
-
-#: ../src/anjuta.glade.h:9
-msgid "Default project directory:"
-msgstr "���ร��อรี�ริยาย�อ���ร��าร:"
-
-#: ../src/anjuta.glade.h:10
-msgid "Developer email address:"
-msgstr "�ี�อยู�อี�มล�ู��ั��า:"
-
-#: ../src/anjuta.glade.h:11
-msgid "Developer name:"
-msgstr "�ื�อ�ู��ั��า:"
-
-#: ../src/anjuta.glade.h:12
-msgid "Do not load last project and files on startup"
-msgstr "�ม���อ��หล���ร��าร�ละ���มล�าสุ���ะ�ริ�ม�ำ�า�"
-
-#: ../src/anjuta.glade.h:13
-msgid "Do not load last session on startup"
-msgstr "�ม���อ��หล�วาระล�าสุ���ะ�ริ�ม�ำ�า�"
-
-#. Style of the buttons/tabs used to select docked windows in anjuta
-#: ../src/anjuta.glade.h:15
-msgid "Dock switcher style:"
-msgstr "รู������รื�อ�สลั� dock:"
-
-#: ../src/anjuta.glade.h:17
-msgid "Select projects directory"
-msgstr "�ลือ����ร��อรี��ร��าร"
-
-#: ../src/anjuta.glade.h:18
-msgid ""
-"Text\n"
-"Icons\n"
-"Text + Icons\n"
-"Gnome toolbar setting\n"
-"Tabs"
-msgstr ""
-"��อ�วาม\n"
-"�อ�อ�\n"
-"��อ�วาม + �อ�อ�\n"
-"�าร�ั����า�����รื�อ�มือ GNOME\n"
-"����"
-
-#. translators: translate the same as in gnome-control-center
-#: ../src/anjuta.glade.h:24
-msgid "Toolbar button labels:"
-msgstr "��าย��อ�วาม���ุ�ม�����รื�อ�มือ:"
-
 #: ../src/anjuta-actions.h:23
 msgid "_File"
 msgstr "�_��ม"
@@ -8582,23 +8721,23 @@ msgstr "��ี�ยว�ั��ลั��อิ�ภาย_�อ�"
 msgid "About third party Anjuta plugins"
 msgstr "��ี�ยว�ั��ลั��อิ� third party �อ��อ��ู�า"
 
-#: ../src/anjuta-app.c:426
+#: ../src/anjuta-app.c:423
 msgid "Edit"
 msgstr "�����"
 
-#: ../src/anjuta-app.c:430 ../src/anjuta-app.c:435
+#: ../src/anjuta-app.c:427 ../src/anjuta-app.c:432
 msgid "View"
 msgstr "มุมมอ�"
 
-#: ../src/anjuta-app.c:663
+#: ../src/anjuta-app.c:668
 msgid "Installed plugins"
 msgstr "�ลั��อิ��ี��ิ��ั���ว�"
 
-#: ../src/anjuta-app.c:667
+#: ../src/anjuta-app.c:672
 msgid "Shortcuts"
 msgstr "�ุ�มลั�"
 
-#: ../src/anjuta-app.c:739
+#: ../src/anjuta-app.c:744
 #, c-format
 msgid "Value doesn't exist"
 msgstr "��า�ี��ม�มีอยู�"
@@ -8641,104 +8780,195 @@ msgstr "- �ุ���รื�อ�มือ�ั��า�����
 msgid "Anjuta"
 msgstr "�อ��ู�า"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:1
+#: ../src/preferences.ui.h:1
+msgid "<b>Appearance</b>"
+msgstr "<b>ลั�ษ�ะ�รา��</b>"
+
+#: ../src/preferences.ui.h:2
+msgid "<b>Project Defaults</b>"
+msgstr "<b>��า�ริยาย�อ���ร��าร</b>"
+
+#: ../src/preferences.ui.h:3
+msgid "<b>Session</b>"
+msgstr "<b>วาระ</b>"
+
+#: ../src/preferences.ui.h:5
+msgid "Default project directory:"
+msgstr "���ร��อรี�ริยาย�อ���ร��าร:"
+
+#: ../src/preferences.ui.h:6
+msgid "Developer email address:"
+msgstr "�ี�อยู�อี�มล�ู��ั��า:"
+
+#: ../src/preferences.ui.h:7
+msgid "Developer name:"
+msgstr "�ื�อ�ู��ั��า:"
+
+#: ../src/preferences.ui.h:8
+msgid "Do not load last project and files on startup"
+msgstr "�ม���อ��หล���ร��าร�ละ���มล�าสุ���ะ�ริ�ม�ำ�า�"
+
+#: ../src/preferences.ui.h:9
+msgid "Do not load last session on startup"
+msgstr "�ม���อ��หล�วาระล�าสุ���ะ�ริ�ม�ำ�า�"
+
+#. Style of the buttons/tabs used to select docked windows in anjuta
+#: ../src/preferences.ui.h:11
+msgid "Dock switcher style:"
+msgstr "รู������รื�อ�สลั� dock:"
+
+#: ../src/preferences.ui.h:13
+msgid "Gnome toolbar setting"
+msgstr "�าม��า�ั�������รื�อ�มือ�อ� GNOME"
+
+#: ../src/preferences.ui.h:14
+msgid "Icons"
+msgstr "�อ�อ�"
+
+#: ../src/preferences.ui.h:15
+msgid "Icons only"
+msgstr "�อ�อ����า�ั��"
+
+#: ../src/preferences.ui.h:16
+msgid "Select projects directory"
+msgstr "�ลือ����ร��อรี��ร��าร"
+
+#: ../src/preferences.ui.h:17
+msgid "Tabs"
+msgstr "����"
+
+#: ../src/preferences.ui.h:19
+msgid "Text + Icons"
+msgstr "��อ�วาม + �อ�อ�"
+
+#: ../src/preferences.ui.h:20
+msgid "Text below icons"
+msgstr "��อ�วาม����อ�อ�"
+
+#: ../src/preferences.ui.h:21
+msgid "Text beside icons"
+msgstr "��อ�วาม��า��อ�อ�"
+
+#: ../src/preferences.ui.h:22
+msgid "Text only"
+msgstr "��อ�วาม���า�ั��"
+
+#. translators: translate the same as in gnome-control-center
+#: ../src/preferences.ui.h:24
+msgid "Toolbar button labels:"
+msgstr "รู�����อ��ุ�ม�������รื�อ�มือ:"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "<b>Autocompletion (C/C++/Java only)</b>"
 msgstr "<b>�าร��ิม���ม�ำอั���มั�ิ (C/C++/�าวา ���า�ั��)</b>"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:2
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 msgid "<b>Calltips</b>"
 msgstr "<b>�ำ��ะ�ำ�าร�รีย�</b>"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:3
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
 msgid "<b>Indentation parameters</b>"
 msgstr "<b>�ารามิ��อร��ารร��ย�อห��า</b>"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:4
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
+#, fuzzy
+msgid "<b>Paranthese indentation </b>"
+msgstr "<b>�ารร��ย�อห��าว��ล��</b>"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:5
 msgid "<b>Smart Indentation</b>"
 msgstr "<b>�ารร��ย�อห��า����ลา�</b>"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:5
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:6
 msgid "Add '(' after function call autocompletion"
 msgstr "��ิ�ม '(' หลั���ิม���ม�าร�รีย��ั���ั���ยอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:6
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:7
 msgid "Add a space after function call autocompletion"
 msgstr "��ิ�ม��อ�ว�า�หลั���ิม���ม�าร�รีย��ั���ั���ยอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:7
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:8
 msgid "Autocomplete"
 msgstr "��ิม���ม�ำอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:8
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:9
 msgid "Autocompletion pop up choices"
 msgstr "�ัว�ลือ��ี��ุ��ึ���อ��าร��ิม���ม�ำอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:9
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:10
 msgid "Brace indentation size in spaces:"
 msgstr "��า��ารร��ย�อห��า�ี��า��ห��วย�ำ�ว���อ�ว�า�:"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:10
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:11
 msgid "Enable adaptive indentation"
 msgstr "��ิ�����า��ารร��ย�อห��า����รั��ัวอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:11
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:12
 msgid "Enable code completion"
 msgstr "��ิ�����า��าร��ิม���ม����"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:12
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:13
 msgid "Enable smart brace completion"
 msgstr "��ิ�����า��าร��ิมว��ล���ิ�อั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:13
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
 msgid "Enable smart indentation"
 msgstr "��ิ�����า��ารร��ย�อห��า����ลา�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:14
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+msgid "Indent:"
+msgstr "ร��ย�อห��า:"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:16
+msgid "Line up parantheses"
+msgstr "�ั�ว��ล���ห��ร��ั�"
+
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:17
 msgid "Pressing tab indents"
 msgstr "������ร��ย�อห��า"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:15
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:18
 msgid "Show calltips"
 msgstr "�ส���ำ��ะ�ำ�าร�รีย�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:16
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:19
 msgid "Smart Indentation"
 msgstr "�ารร��ย�อห��า����ลา�"
 
-#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.glade.h:17
+#: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:20
 msgid "Statement indentation size in spaces:"
 msgstr "��า��ารร��ย�อห��า��อย��ล���ห��วย�ำ�ว���อ�ว�า�:"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1900
+#: ../plugins/language-support-cpp-java/plugin.c:1916
 msgid "_AutoComplete"
 msgstr "�_�ิม���ม�ำอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1901
+#: ../plugins/language-support-cpp-java/plugin.c:1917
 msgid "AutoComplete the current word"
 msgstr "��ิม���ม�ำ�ั��ุ�ั���ยอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1907
+#: ../plugins/language-support-cpp-java/plugin.c:1923
 msgid "Auto Indent"
 msgstr "ร��ย�อห��าอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1908
+#: ../plugins/language-support-cpp-java/plugin.c:1924
 msgid "Auto indent current line or selection based on indentation settings"
 msgstr "ร���รร�ั��ั��ุ�ั�หรือ��อ�วาม�ี��ลือ���ยอั���มั� �ึ��อยู��ั���า�ั���ารร��ย�อห��า"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1913
+#: ../plugins/language-support-cpp-java/plugin.c:1929
 msgid "Swap .h/.c"
 msgstr "สลั� .h/.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1914
+#: ../plugins/language-support-cpp-java/plugin.c:1930
 msgid "Swap c header and source files"
 msgstr "สลั����มส�ว�หัว�ั��อร�สภาษา C"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1957
+#: ../plugins/language-support-cpp-java/plugin.c:1973
 msgid "C++/Java Assistance"
 msgstr "��รื�อ�มือ��วย C++/Java"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2045
-#: ../plugins/language-support-cpp-java/plugin.c:2054
+#: ../plugins/language-support-cpp-java/plugin.c:2066
+#: ../plugins/language-support-cpp-java/plugin.c:2075
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
@@ -8962,6 +9192,90 @@ msgstr "�����อ��� Autotools"
 msgid "Autotools backend for project manager"
 msgstr "�����อ��� Autotools สำหรั���รื�อ�มือ�ั��าร��ร��าร"
 
+#~ msgid ""
+#~ "General Public License (GPL)\n"
+#~ "Lesser General Public License (LGPL)\n"
+#~ "No License"
+#~ msgstr ""
+#~ "สั��าอ�ุ�า�สา�าร�ะ�ั�ว�� (GPL)\n"
+#~ "สั��าอ�ุ�า�สา�าร�ะ�ั�ว�������อ��ร� (LGPL)\n"
+#~ "�ม�มีสั��าอ�ุ�า�"
+
+#~ msgid ""
+#~ "Top\n"
+#~ "Bottom\n"
+#~ "Left\n"
+#~ "Right"
+#~ msgstr ""
+#~ "��\n"
+#~ "ล�า�\n"
+#~ "��าย\n"
+#~ "�วา"
+
+#~ msgid ""
+#~ "Underline-Plain\n"
+#~ "Underline-Squiggle\n"
+#~ "Underline-TT\n"
+#~ "Diagonal\n"
+#~ "Strike-Out"
+#~ msgstr ""
+#~ "�ี��ส�����-�รรม�า\n"
+#~ "�ี��ส�����-หยั�\n"
+#~ "�ี��ส�����-TT\n"
+#~ "�ส����ย�\n"
+#~ "�ี���า"
+
+#~ msgid "Couldn't load glade file"
+#~ msgstr "�ม�สามาร��หล����ม glade ���"
+
+#~ msgid "<b>Scratchbox Options</b>\n"
+#~ msgstr "<b>�ัว�ลือ��อ� Scratchbox</b>\n"
+
+#~ msgid "Scratchbox directory:"
+#~ msgstr "���ร��อรี Scratchbox:"
+
+#~ msgid "Scratchbox target:"
+#~ msgstr "���าหมาย Scratchbox:"
+
+#~ msgid "Scratchbox version:"
+#~ msgstr "รุ���อ� Scratchbox:"
+
+#~ msgid "Scratchbox"
+#~ msgstr "Scratchbox"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "\n"
+#~ msgstr ""
+#~ "�ริยาย\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "Text below icons\n"
+#~ "Text beside icons\n"
+#~ "Icons only\n"
+#~ "Text only"
+#~ msgstr ""
+#~ "��ย�ริยาย\n"
+#~ "��อ�วาม����อ�อ�\n"
+#~ "��อ�วาม��า��อ�อ�\n"
+#~ "�อ�อ����า�ั��\n"
+#~ "��อ�วาม���า�ั��"
+
+#~ msgid ""
+#~ "Text\n"
+#~ "Icons\n"
+#~ "Text + Icons\n"
+#~ "Gnome toolbar setting\n"
+#~ "Tabs"
+#~ msgstr ""
+#~ "��อ�วาม\n"
+#~ "�อ�อ�\n"
+#~ "��อ�วาม + �อ�อ�\n"
+#~ "�าร�ั����า�����รื�อ�มือ GNOME\n"
+#~ "����"
+
 #~ msgid "Update the graph"
 #~ msgstr "�รั���อมูล�รา�"
 
@@ -9319,9 +9633,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Pressing tab inserts indentation"
 #~ msgstr "�าร��������ร��ารร��ย�อห��า"
 
-#~ msgid "Printing"
-#~ msgstr "�าร�ิม��"
-
 #~ msgid "Select highlight style to edit:"
 #~ msgstr "�ลือ�รู�����าร�����ี��ะ�����:"
 
@@ -9334,18 +9645,9 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Strip trailling spaces on file save"
 #~ msgstr "��ั���อ�ว�า���าย�รร�ั��มื�อ�ั��ึ����ม"
 
-#~ msgid "Tab size in spaces:"
-#~ msgstr "��า����������ำ�ว���อ�ว�า�:"
-
-#~ msgid "Underlined"
-#~ msgstr "�ี��ส�����"
-
 #~ msgid "Use default"
 #~ msgstr "�����า�ริยาย"
 
-#~ msgid "Use tabs for indentation"
-#~ msgstr "����������ารร��ย�อห��า"
-
 #~ msgid "View EOL chars"
 #~ msgstr "�ส��อั��ระ EOL"
 
@@ -9450,60 +9752,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ "�ึ��อา��ำ�ห���ร��รม�ำ�า��ิ���ี�ย�หรือ�ม��ส�ียร\n"
 #~ "�อ��ู�า�ะ�อย�ลั����ี���า�ั���ี��ำห���ว����ัว (�ึ��มี�วามสามาร��ำ�ั�)"
 
-#~ msgid "<b>Color scheme:</b>"
-#~ msgstr "<b>�ุ�สี:</b>"
-
-#~ msgid "<b>Font:</b>"
-#~ msgstr "<b>���อั�ษร:</b>"
-
-#~ msgid "<b>Indentation and auto-format options</b>"
-#~ msgstr "<b>�ัว�ลือ��ารร��ย�อห��า�ละรู����อั���มั�ิ</b>"
-
-#~ msgid "<b>View</b>"
-#~ msgstr "<b>มุมมอ�</b>"
-
-#~ msgid "Create backup files"
-#~ msgstr "สร�า����มสำรอ�"
-
-#~ msgid "Font"
-#~ msgstr "���อั�ษร"
-
-#~ msgid "Highlight current line"
-#~ msgstr "�����รร�ั��ั��ุ�ั�"
-
-#~ msgid "Highlight matching brackets"
-#~ msgstr "����ว��ล���ี����า�ู�"
-
-#~ msgid "Highlight syntax"
-#~ msgstr "�����วยา�ร��"
-
-#~ msgid "Print Linenumbers"
-#~ msgstr "�ิม���ล��รร�ั�"
-
-#~ msgid "Print page footer"
-#~ msgstr "�ิม����าย�ระ�าษ"
-
-#~ msgid "Print page header"
-#~ msgstr "�ิม��หัว�ระ�าษ"
-
-#~ msgid "Right margin position in characters"
-#~ msgstr "�ำ�ห����อ��วา�����ำ�ว��ัวอั�ษร"
-
-#~ msgid "Show line numbers"
-#~ msgstr "�ส���ล��รร�ั�"
-
-#~ msgid "Show marks"
-#~ msgstr "�ส���อ��ำ��รื�อ�หมาย"
-
-#~ msgid "Show right margin"
-#~ msgstr "�ส���ั��ห��า�วา"
-
-#~ msgid "Use theme font"
-#~ msgstr "������อั�ษร�อ��ีม"
-
-#~ msgid "Wrap long lines to fit on paper"
-#~ msgstr "�ั��รร�ั�ยาว�ห��อ�ีห��า�ระ�าษ"
-
 #~ msgid "<b>Program to test:</b>"
 #~ msgstr "<b>��ร��รม�ี��ะ��สอ�:</b>"
 
@@ -9986,15 +10234,9 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ "a terminal."
 #~ msgstr "�ลั��อิ���อร�มิ�ัล�อ��อ��ู�ายั��ม��ิ��ั�� ��ร��รม�ะ�ำ�า���ย�ม������อร�มิ�ัล"
 
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-
 #~ msgid "gtk-clear"
 #~ msgstr "gtk-clear"
 
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
 #~ msgid "Close"
 #~ msgstr "�ิ�"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]