[anjuta] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit 603004a68551d31657af9b9dce119ee9f906fc38
Author: Akom C <knight2000 gmail com>
Date:   Wed Jan 20 18:05:37 2010 +0700

    Updated Thai translation.

 po/th.po | 4153 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2275 insertions(+), 1878 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index 65db8cd..f3283ab 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,17 +1,17 @@
 # Thai translation of anjuta.
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the anjuta package.
-# Akom C. <knight2000 gmail com>, 2008-2009.
-# Theppitak Karoonboonyanan <thep linux thai net>, 2008-2009.
+# Akom C. <knight2000 gmail com>, 2008-2010.
+# Theppitak Karoonboonyanan <thep linux thai net>, 2008-2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: anjuta\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=anjuta&component=core application\n"
-"POT-Creation-Date: 2009-08-23 21:04+0000\n"
-"PO-Revision-Date: 2009-09-15 13:11+0700\n"
-"Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
+"POT-Creation-Date: 2010-01-17 17:02+0000\n"
+"PO-Revision-Date: 2010-01-20 17:48+0700\n"
+"Last-Translator: อา�ม ���ิ�ั��วา���� <knight2000 gmail com>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr "���ม�ึ��ุ��ยายาม��ิ��ั��
 #: ../libanjuta/anjuta-convert.c:168 ../libanjuta/anjuta-convert.c:207
 #, c-format
 msgid ""
-"anjuta was not able to automatically determine the encoding of the file you "
+"Anjuta was not able to automatically determine the encoding of the file you "
 "want to open."
 msgstr "�อ��ู�า�ม�สามาร�ระ�ุรหัสอั��ระ�อ����ม�ี��ุ���อ��าร��ิ���ยอั���มั�ิ���"
 
@@ -184,12 +184,14 @@ msgstr "�วีย��าม"
 msgid "Thai"
 msgstr "��ย"
 
-#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:3204
+#: ../libanjuta/anjuta-encodings.c:441 ../plugins/gbf-am/gbf-am-project.c:193
+#: ../plugins/gbf-am/gbf-am-project.c:3372
 #: ../plugins/gbf-am/gbf-am-properties.c:129
-#: ../plugins/gbf-am/gbf-am-properties.c:173
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3092
+#: ../plugins/gbf-am/gbf-am-properties.c:176
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3093
 #: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:104
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:148
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:151
+#: ../plugins/dir-project/dir-project.c:837
 msgid "Unknown"
 msgstr "�ม��รา�"
 
@@ -203,11 +205,11 @@ msgstr "�ม�สามาร��รีย��ำสั��: \"%s\""
 msgid "execvp failed"
 msgstr "execvp ล�ม�หลว"
 
-#: ../libanjuta/anjuta-plugin.c:327 ../libanjuta/anjuta-plugin-manager.c:2310
+#: ../libanjuta/anjuta-plugin.c:326 ../libanjuta/anjuta-plugin-manager.c:2312
 msgid "Anjuta Shell"
 msgstr "��ลล��อ��ู�า"
 
-#: ../libanjuta/anjuta-plugin.c:328
+#: ../libanjuta/anjuta-plugin.c:327
 msgid "Anjuta shell that will contain the plugin"
 msgstr "��ลล��อ��ู�า�ี��ะ�รร�ุ�ลั��อิ�"
 
@@ -234,7 +236,7 @@ msgid "Load"
 msgstr "�หล�"
 
 #: ../libanjuta/anjuta-plugin-manager.c:923
-#: ../libanjuta/anjuta-plugin-manager.c:1941
+#: ../libanjuta/anjuta-plugin-manager.c:1943
 msgid "Available Plugins"
 msgstr "�ลั��อิ��ี�มีอยู�"
 
@@ -261,13 +263,13 @@ msgstr "ล�า��าร�ลือ��ลั��อิ�"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1357
 #: ../libanjuta/anjuta-plugin-manager.c:1508 ../libanjuta/anjuta-profile.c:507
-#: ../plugins/debug-manager/queue.c:556
+#: ../plugins/debug-manager/queue.c:537
 msgid "Select a plugin"
 msgstr "�ลือ��ลั��อิ�"
 
 #: ../libanjuta/anjuta-plugin-manager.c:1358
 #: ../libanjuta/anjuta-plugin-manager.c:1509
-#: ../plugins/debug-manager/queue.c:557
+#: ../plugins/debug-manager/queue.c:538
 msgid "Please select a plugin to activate"
 msgstr "�รุ�า�ลือ��ลั��อิ���ื�อ����า�"
 
@@ -276,49 +278,49 @@ msgstr "�รุ�า�ลือ��ลั��อิ���ื�อ�
 msgid "No plugin is able to load other plugins in %s"
 msgstr "�ม�มี�ลั��อิ��ี�สามาร��หล��ลั��อิ�อื���� %s"
 
-#: ../libanjuta/anjuta-plugin-manager.c:1960
+#: ../libanjuta/anjuta-plugin-manager.c:1962
 msgid "Remember this selection"
 msgstr "�ำ�าร�ลือ��ี�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2291
+#: ../libanjuta/anjuta-plugin-manager.c:2293
 msgid "Profiles"
 msgstr "��ร��ล�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2292
+#: ../libanjuta/anjuta-plugin-manager.c:2294
 msgid "Current stack of profiles"
 msgstr "ส���������ุ���ร��ล��ั��ุ�ั�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2297
+#: ../libanjuta/anjuta-plugin-manager.c:2299
 msgid "Available plugins"
 msgstr "�ลั��อิ��ี�มีอยู�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2298
+#: ../libanjuta/anjuta-plugin-manager.c:2300
 msgid "Currently available plugins found in plugin paths"
 msgstr "�ลั��อิ��ี�มีอยู����หล���ลั��อิ�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2304
+#: ../libanjuta/anjuta-plugin-manager.c:2306
 msgid "Activated plugins"
 msgstr "�ลั��อิ��ี��ำ�า�อยู�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2305
+#: ../libanjuta/anjuta-plugin-manager.c:2307
 msgid "Currently activated plugins"
 msgstr "�ลั��อิ��ั��ุ�ั��ี��ำ�า�อยู�"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2311
+#: ../libanjuta/anjuta-plugin-manager.c:2313
 msgid "Anjuta shell for which the plugins are made"
 msgstr "��ลล��อ��ู�า�ี��ลั��อิ��ี��ำ�า���วย"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2319
+#: ../libanjuta/anjuta-plugin-manager.c:2321
 msgid "Anjuta Status"
 msgstr "ส�า�ะ�อ��ู�า"
 
-#: ../libanjuta/anjuta-plugin-manager.c:2320
+#: ../libanjuta/anjuta-plugin-manager.c:2322
 msgid "Anjuta status to use in loading and unloading of plugins"
 msgstr "ส�า�ะ�อ��ู�า�ี��ะ������าร�หล��ละ�อ��ลั��อิ�ออ�"
 
 #. DEBUG_PRINT ("Icon: %s", icon_path);
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-plugin-manager.c:2480
+#: ../libanjuta/anjuta-plugin-manager.c:2482
 msgid "Loaded:"
 msgstr "�หล��ล�ว:"
 
@@ -351,7 +353,7 @@ msgid "Synchronization file"
 msgstr "���ม�ี��ะ�รั���อมูล�ร��ั�"
 
 #: ../libanjuta/anjuta-profile.c:281
-msgid "File to sync the profile xml"
+msgid "File to syncronize the profile XML"
 msgstr "���ม�ี��ะ�รั���อมูล XML �อ���ร��ล��ห��ร��ั�"
 
 #: ../libanjuta/anjuta-profile.c:508
@@ -361,7 +363,7 @@ msgstr "�รุ�า�ลือ��ลั��อิ��า�ราย
 #: ../libanjuta/anjuta-profile.c:672
 #, c-format
 msgid ""
-"Failed to read '%s': XML parse error. Invalid or corrupted anjuta plugins "
+"Failed to read '%s': XML parse error. Invalid or corrupted Anjuta plugins "
 "profile."
 msgstr ""
 "อ�า� '%s' �ม�สำ�ร��: ��ิ���อ�ิ��ลา����าร��� XML "
@@ -402,8 +404,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.ui.h:4 ../src/anjuta-app.c:723
-#: ../src/preferences.ui.h:10
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3 ../src/anjuta-app.c:723
+#: ../src/preferences.ui.h:11
 msgid "General"
 msgstr "�ั�ว��"
 
@@ -411,24 +413,24 @@ msgstr "�ั�ว��"
 msgid "Anjuta Preferences"
 msgstr "�าร�รั������อ��ู�า"
 
-#: ../libanjuta/anjuta-save-prompt.c:158
+#: ../libanjuta/anjuta-save-prompt.c:157
 msgid "Select the items to save:"
 msgstr "�ลือ�ราย�าร�ี��ะ�ั��ึ�:"
 
-#: ../libanjuta/anjuta-save-prompt.c:183
+#: ../libanjuta/anjuta-save-prompt.c:182
 msgid "If you do not save, all your changes will be lost."
 msgstr "��า�ุ�ยั��ม��ั��ึ� สิ���ี��ุ���ลี�ย���ล��ะสู�หาย�ั��หม�"
 
-#: ../libanjuta/anjuta-save-prompt.c:190
-#: ../plugins/document-manager/plugin.c:596
+#: ../libanjuta/anjuta-save-prompt.c:189
+#: ../plugins/document-manager/plugin.c:603
 msgid "Save"
 msgstr "�ั��ึ�"
 
-#: ../libanjuta/anjuta-save-prompt.c:197
+#: ../libanjuta/anjuta-save-prompt.c:196
 msgid "Item"
 msgstr "ราย�าร"
 
-#: ../libanjuta/anjuta-save-prompt.c:203
+#: ../libanjuta/anjuta-save-prompt.c:202
 msgid "_Discard changes"
 msgstr "_ละ�ิ���าร��ลี�ย���ล�"
 
@@ -463,11 +465,11 @@ msgid "Shortcut"
 msgstr "�ุ�มลั�"
 
 #. Avoid space in translated string
-#: ../libanjuta/anjuta-utils.c:355
+#: ../libanjuta/anjuta-utils.c:356
 msgid "System:"
 msgstr "ระ��:"
 
-#: ../libanjuta/anjuta-utils.c:493
+#: ../libanjuta/anjuta-utils.c:494
 #, c-format
 msgid ""
 "The \"%s\" utility is not installed.\n"
@@ -477,27 +479,27 @@ msgstr ""
 "�รุ�า�ิ��ั��"
 
 #. Try xterm
-#: ../libanjuta/anjuta-utils.c:986
-msgid "Cannot find a terminal, using xterm, even if it may not work"
+#: ../libanjuta/anjuta-utils.c:987
+msgid "Cannot find a terminal; using xterm, even if it may not work"
 msgstr "หา��อร�มิ�ัล�ม��� �ะ��� xterm �ม�ว�ามั�อา��ะ�ำ�า��ม�สม�ูร��"
 
-#: ../libanjuta/anjuta-utils.c:1022 ../libanjuta/anjuta-utils.c:1026
-#: ../libanjuta/anjuta-utils.c:1054 ../libanjuta/anjuta-utils.c:1058
+#: ../libanjuta/anjuta-utils.c:1023 ../libanjuta/anjuta-utils.c:1027
+#: ../libanjuta/anjuta-utils.c:1055 ../libanjuta/anjuta-utils.c:1059
 #, c-format
 msgid "Cannot execute command: %s (using shell %s)\n"
 msgstr "�ม�สามาร��รีย��ำสั��: %s (��ย�����ลล� %s)\n"
 
-#: ../libanjuta/anjuta-utils.c:1690
+#: ../libanjuta/anjuta-utils.c:1691
 msgid ""
-"Unable to display help. Please make sure Anjuta documentation package is "
-"install. It can be downloaded from http://anjuta.org";
+"Unable to display help. Please make sure the Anjuta documentation package is "
+"installed. It can be downloaded from http://anjuta.org.";
 msgstr ""
 "�ม�สามาร��ส��วิ�ี��� �รุ�า�รว�สอ��ห������ว�า����ิ��ั���������อ�สาร�อ��อ��ู�า "
 "�ึ���าว���หล�����า� http://anjuta.org";
 
 # msgid "Unable to build user interface for New File"
 # c-format
-#: ../libanjuta/anjuta-utils.c:2129
+#: ../libanjuta/anjuta-utils.c:2130
 #, c-format
 msgid "Unable to load user interface file: %s"
 msgstr "�ม�สามาร��หล����มส�ว��ิ���อ�ู����: %s"
@@ -523,7 +525,8 @@ msgid "Conflicted"
 msgstr "�ั��ย��"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:105
-msgid "Up to date"
+#: ../plugins/file-manager/file-view.c:73
+msgid "Up-to-date"
 msgstr "������อมูลล�าสุ�"
 
 #: ../libanjuta/anjuta-vcs-status-tree-view.c:109
@@ -562,8 +565,8 @@ msgstr "อ�อ������ Pixbuf"
 msgid "The pixbuf to render."
 msgstr "pixbuf �ี��ะวา�"
 
-#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3041
-#: ../plugins/glade/plugin.c:3076
+#: ../libanjuta/resources.c:63 ../plugins/glade/plugin.c:3042
+#: ../plugins/glade/plugin.c:3077
 #, c-format
 msgid "Widget not found: %s"
 msgstr "�ม���วิ�����: %s"
@@ -574,67 +577,67 @@ msgid "Could not find application pixmap file: %s"
 msgstr "�ม������ม pixmap �อ���ร��รม: %s"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:1
-msgid "<b>Build</b>"
-msgstr "<b>�ระ�อ�สร�า�</b>"
+#: ../plugins/run-program/anjuta-run-program.ui.h:1
+msgid "Arguments:"
+msgstr "อาร��ิว�ม���:"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:2
-msgid "<b>Configuration:</b>"
-msgstr "<b>��า�ั��:</b>"
+msgid "Build"
+msgstr "�ระ�อ�สร�า�"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:3
-msgid "<b>Install</b>"
-msgstr "<b>�ิ��ั��</b>"
+msgid "Build Directory:"
+msgstr "���ร��อรีสำหรั��ระ�อ�สร�า�"
 
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:4
-msgid "<b>Regenerate project</b>"
-msgstr "<b>สร�า���ร��าร��ำ</b>"
+msgid "Configuration:"
+msgstr "��า�ั��:"
 
 #: ../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.ui.h:6
-#: ../plugins/run-program/anjuta-run-program.ui.h:1
-msgid "Arguments:"
-msgstr "อาร��ิว�ม���:"
-
-#: ../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.ui.h:8
 msgid "Configure Options:"
 msgstr "�ัว�ลือ�สำหรั��ั����า:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:6
 msgid "Configure Project"
 msgstr "�ั����า��ร��าร"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:7
 msgid "Continue on errors"
 msgstr "�ำ��อ���ึ��ม��ะมี��อ�ิ��ลา�"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:8
 msgid "Highlight message locations in editor"
 msgstr "�����ำ�ห����ี���ี�ยว�ั���อ�วาม����รื�อ�มือ�����"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:9
+msgid "Install"
+msgstr "�ิ��ั��"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:10
 msgid "Install as root:"
 msgstr "�ิ��ั�����า�ะ�ู��ู�ลระ��:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
-#: ../plugins/tools/anjuta-tools.ui.h:9
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:11
+msgid "Regenerate project"
+msgstr "สร�า���ร��าร��ำ"
+
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:12
+#: ../plugins/tools/anjuta-tools.ui.h:8
 msgid "Run in terminal"
 msgstr "�รีย�����อร�มิ�ัล"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:13
 msgid "Run several commands at a time:"
 msgstr "�รีย�หลาย�ำสั����า��ั�:"
 
-#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:14
 msgid "Select Program"
 msgstr "�ลือ���ร��รม"
 
+#: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:15
+msgid "Select Program to run:"
+msgstr "�ลือ���ร��รม�ี��ะ�รีย�:"
+
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui.h:16
 msgid "Select a build directory"
 msgstr "�ลือ����ร��อรีสำหรั��ระ�อ�สร�า�"
@@ -643,22 +646,23 @@ msgstr "�ลือ����ร��อรีสำหรั��ระ�
 msgid "Translate messages"
 msgstr "��ล��อ�วาม"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:62
+#: ../plugins/build-basic-autotools/configuration-list.c:68
+#: ../plugins/class-gen/window.c:525
 #: ../plugins/search/search_preferences.c:523
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2 ../src/preferences.ui.h:2
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1 ../src/preferences.ui.h:2
 msgid "Default"
 msgstr "�ริยาย"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:63
+#: ../plugins/build-basic-autotools/configuration-list.c:69
 #: ../plugins/gdb/utilities.c:297
 msgid "Debug"
 msgstr "�ี�ั��"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:64
+#: ../plugins/build-basic-autotools/configuration-list.c:70
 msgid "Profiling"
 msgstr "วั��ระสิ��ิภา�"
 
-#: ../plugins/build-basic-autotools/configuration-list.c:65
+#: ../plugins/build-basic-autotools/configuration-list.c:71
 msgid "Optimized"
 msgstr "�รั��ระสิ��ิภา�"
 
@@ -667,8 +671,9 @@ msgid "No executables in this project!"
 msgstr "�ม�มี���ม��ร��รม����ร��าร�ี�!"
 
 #: ../plugins/build-basic-autotools/executer.c:154
-#: ../plugins/gbf-am/gbf-am-project.c:3194
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3086
+#: ../plugins/gbf-am/gbf-am-project.c:196
+#: ../plugins/gbf-am/gbf-am-project.c:3362
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3087
 msgid "Program"
 msgstr "��ร��รม"
 
@@ -684,8 +689,9 @@ msgid "Program '%s' is not a local file"
 msgstr "��ร��รม '%s' �ม�������ม����รื�อ�"
 
 #: ../plugins/build-basic-autotools/executer.c:310
+#: ../plugins/run-program/execute.c:76
 #, c-format
-msgid "Program '%s' does not exists"
+msgid "Program '%s' does not exist"
 msgstr "��ร��รม '%s' �ม�มีอยู�"
 
 #: ../plugins/build-basic-autotools/executer.c:318
@@ -729,272 +735,272 @@ msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+`(.+)'"
 msgid "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 msgstr "make(\\[\\d+\\])?:\\s+Leaving\\s+directory\\s+'(.+)'"
 
-#: ../plugins/build-basic-autotools/plugin.c:827
+#: ../plugins/build-basic-autotools/plugin.c:845
 #, c-format
 msgid "Entering: %s"
 msgstr "�ำลั����าสู�: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:863
+#: ../plugins/build-basic-autotools/plugin.c:881
 #, c-format
 msgid "Leaving: %s"
 msgstr "�ำลั�ออ��า�: %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:896
+#: ../plugins/build-basic-autotools/plugin.c:914
 #: ../plugins/tools/execute.c:330
 msgid "warning:"
 msgstr "�ำ��ือ�:"
 
-#: ../plugins/build-basic-autotools/plugin.c:902
+#: ../plugins/build-basic-autotools/plugin.c:920
 #: ../plugins/tools/execute.c:335
 msgid "error:"
 msgstr "��อ�ิ��ลา�:"
 
-#: ../plugins/build-basic-autotools/plugin.c:1019
+#: ../plugins/build-basic-autotools/plugin.c:1037
 #, c-format
 msgid "Command exited with status %d"
 msgstr "�ำสั�����าร�ำ�า���วยส�า�ะ %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1029
-#: ../plugins/build-basic-autotools/plugin.c:1505
+#: ../plugins/build-basic-autotools/plugin.c:1047
+#: ../plugins/build-basic-autotools/plugin.c:1523
 #, c-format
 msgid "Command canceled by user"
 msgstr "�ำสั���ู�ย��ลิ���ย�ู����"
 
-#: ../plugins/build-basic-autotools/plugin.c:1034
+#: ../plugins/build-basic-autotools/plugin.c:1052
 #, c-format
 msgid "Command aborted by user"
 msgstr "�ำสั���ู��ลิ��ำ��ย�ู����"
 
-#: ../plugins/build-basic-autotools/plugin.c:1039
+#: ../plugins/build-basic-autotools/plugin.c:1057
 #, c-format
 msgid "Command terminated with signal %d"
 msgstr "�ำสั���ู��ำ�ห�หยุ���ยสั��า� %d"
 
-#: ../plugins/build-basic-autotools/plugin.c:1047
+#: ../plugins/build-basic-autotools/plugin.c:1065
 msgid "Command terminated for an unknown reason"
 msgstr "�ำสั���ู��ำ�ห�หยุ���ย�ม��รา��ห�ุ�ล"
 
-#: ../plugins/build-basic-autotools/plugin.c:1065
+#: ../plugins/build-basic-autotools/plugin.c:1083
 #, c-format
 msgid "Total time taken: %lu secs\n"
 msgstr "�วลา�ี�����ั��หม�: %lu วิ�า�ี\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1072
+#: ../plugins/build-basic-autotools/plugin.c:1090
 msgid "Completed unsuccessfully\n"
 msgstr "�ม�สำ�ร��\n"
 
-#: ../plugins/build-basic-autotools/plugin.c:1080
+#: ../plugins/build-basic-autotools/plugin.c:1098
 #: ../plugins/tools/execute.c:516
 msgid "Completed successfully\n"
 msgstr "สำ�ร��\n"
 
 #. Translators: the first number is the number of the build attemp,
 #. the string is the directory where the build takes place
-#: ../plugins/build-basic-autotools/plugin.c:1168
+#: ../plugins/build-basic-autotools/plugin.c:1186
 #, c-format
 msgid "Build %d: %s"
 msgstr "�าร�ระ�อ�สร�า� %d: %s"
 
 #. Need to run make clean before
-#: ../plugins/build-basic-autotools/plugin.c:1499
+#: ../plugins/build-basic-autotools/plugin.c:1517
 msgid ""
 "Before using this new configuration, the default one needs to be removed. Do "
 "you want to do that ?"
 msgstr "��อ�����าร�ั����า�หม��ี� ��อ�ล���า�ริยาย��อ� ยื�ยั��ี��ะ�ำ�����ั��หรือ�ม�?"
 
-#: ../plugins/build-basic-autotools/plugin.c:1802
+#: ../plugins/build-basic-autotools/plugin.c:1820
 #, c-format
-msgid "Can not compile \"%s\": No compile rule defined for this file type."
+msgid "Cannot compile \"%s\": No compile rule defined for this file type."
 msgstr "�ม�สามาร��อม��ล� \"%s\": �ม�����ำห�����อม��ล��ว�สำหรั����ม��ิ��ี�"
 
-#: ../plugins/build-basic-autotools/plugin.c:1928
+#: ../plugins/build-basic-autotools/plugin.c:1955
 #, c-format
-msgid "Can not configure project: Missing configure script in %s."
+msgid "Cannot configure project: Missing configure script in %s."
 msgstr "�ม�สามาร��ั����า��ร��าร: �า�ส�ริ����ั����า�� %s"
 
-#: ../plugins/build-basic-autotools/plugin.c:2394
-#: ../plugins/build-basic-autotools/plugin.c:2468
-#: ../plugins/build-basic-autotools/plugin.c:2478
-#: ../plugins/build-basic-autotools/plugin.c:2496
+#: ../plugins/build-basic-autotools/plugin.c:2432
 #: ../plugins/build-basic-autotools/plugin.c:2506
-#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2516
+#: ../plugins/build-basic-autotools/plugin.c:2534
+#: ../plugins/build-basic-autotools/plugin.c:2544
+#: ../plugins/build-basic-autotools/plugin.c:2601
 #, c-format
 msgid "_Build"
 msgstr "�ระ�อ�_สร�า�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2398
+#: ../plugins/build-basic-autotools/plugin.c:2436
 msgid "_Build Project"
 msgstr "�ระ�อ�_สร�า���ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2399
+#: ../plugins/build-basic-autotools/plugin.c:2437
 msgid "Build whole project"
 msgstr "�ระ�อ�สร�า��ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2404
+#: ../plugins/build-basic-autotools/plugin.c:2442
 msgid "_Install Project"
 msgstr "_�ิ��ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2405
+#: ../plugins/build-basic-autotools/plugin.c:2443
 msgid "Install whole project"
 msgstr "�ิ��ั���ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2410
+#: ../plugins/build-basic-autotools/plugin.c:2448
 msgid "_Clean Project"
 msgstr "�_����วา���ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2411
+#: ../plugins/build-basic-autotools/plugin.c:2449
 msgid "Clean whole project"
 msgstr "�����วา��ั����ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2416
-msgid "C_onfigure Project..."
-msgstr "_�ั����า��ร��าร..."
+#: ../plugins/build-basic-autotools/plugin.c:2454
+msgid "C_onfigure Projectâ?¦"
+msgstr "_�ั����า��ร��าร�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2417
+#: ../plugins/build-basic-autotools/plugin.c:2455
 msgid "Configure project"
 msgstr "�ั����า��ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2422
+#: ../plugins/build-basic-autotools/plugin.c:2460
 msgid "Build _Tarball"
 msgstr "�ระ�อ�สร�า����ม_�าร�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2423
+#: ../plugins/build-basic-autotools/plugin.c:2461
 msgid "Build project tarball distribution"
 msgstr "�ระ�อ�สร�า����ม�าร������าย�อ���ร��าร"
 
-#: ../plugins/build-basic-autotools/plugin.c:2428
+#: ../plugins/build-basic-autotools/plugin.c:2466
 msgid "_Build Module"
 msgstr "�ระ�อ�_สร�า�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2429
+#: ../plugins/build-basic-autotools/plugin.c:2467
 msgid "Build module associated with current file"
 msgstr "�ระ�อ�สร�า�มอ�ูล�ี���ี�ยว�ั����ม�ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2434
+#: ../plugins/build-basic-autotools/plugin.c:2472
 msgid "_Install Module"
 msgstr "_�ิ��ั��มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2435
+#: ../plugins/build-basic-autotools/plugin.c:2473
 msgid "Install module associated with current file"
 msgstr "�ิ��ั��มอ�ูล�ี���ี�ยว�ั����ม�ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2440
+#: ../plugins/build-basic-autotools/plugin.c:2478
 msgid "_Clean Module"
 msgstr "�_����วา�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2441
+#: ../plugins/build-basic-autotools/plugin.c:2479
 msgid "Clean module associated with current file"
 msgstr "�����วา�มอ�ูล�ี���ี�ยว�ั����ม�ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2446
+#: ../plugins/build-basic-autotools/plugin.c:2484
 msgid "Co_mpile File"
 msgstr "�อ_ม��ล����ม"
 
-#: ../plugins/build-basic-autotools/plugin.c:2447
+#: ../plugins/build-basic-autotools/plugin.c:2485
 msgid "Compile current editor file"
 msgstr "�อม��ล����ม�ั��ุ�ั��ี���ิ�อยู�����รื�อ�มือ�������อ�วาม"
 
-#: ../plugins/build-basic-autotools/plugin.c:2452
+#: ../plugins/build-basic-autotools/plugin.c:2490
 msgid "Select Configuration"
 msgstr "�ลือ���า�ั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2453
+#: ../plugins/build-basic-autotools/plugin.c:2491
 msgid "Select current configuration"
 msgstr "�ลือ���า�ั���ั��ุ�ั�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2458
+#: ../plugins/build-basic-autotools/plugin.c:2496
 msgid "Remove Configuration"
 msgstr "ล���า�ั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2459
+#: ../plugins/build-basic-autotools/plugin.c:2497
 msgid ""
 "Clean project (distclean) and remove configuration directory if possible"
 msgstr "ล�า���ร��าร (distclean) �ละล����ร��อรี��า�ั�� ��า�������������"
 
-#: ../plugins/build-basic-autotools/plugin.c:2472
-#: ../plugins/build-basic-autotools/plugin.c:2500
+#: ../plugins/build-basic-autotools/plugin.c:2510
+#: ../plugins/build-basic-autotools/plugin.c:2538
 msgid "_Compile"
 msgstr "_�อม��ล�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2473
-#: ../plugins/build-basic-autotools/plugin.c:2501
+#: ../plugins/build-basic-autotools/plugin.c:2511
+#: ../plugins/build-basic-autotools/plugin.c:2539
 msgid "Compile file"
 msgstr "�อม��ล����ม"
 
-#: ../plugins/build-basic-autotools/plugin.c:2479
-#: ../plugins/build-basic-autotools/plugin.c:2507
+#: ../plugins/build-basic-autotools/plugin.c:2517
+#: ../plugins/build-basic-autotools/plugin.c:2545
 msgid "Build module"
 msgstr "�ระ�อ�สร�า�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2484
-#: ../plugins/build-basic-autotools/plugin.c:2512
-#: ../plugins/build-basic-autotools/plugin.c:2570
+#: ../plugins/build-basic-autotools/plugin.c:2522
+#: ../plugins/build-basic-autotools/plugin.c:2550
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Install"
 msgstr "_�ิ��ั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2485
-#: ../plugins/build-basic-autotools/plugin.c:2513
+#: ../plugins/build-basic-autotools/plugin.c:2523
+#: ../plugins/build-basic-autotools/plugin.c:2551
 msgid "Install module"
 msgstr "�ิ��ั��มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2490
-#: ../plugins/build-basic-autotools/plugin.c:2518
-#: ../plugins/build-basic-autotools/plugin.c:2577
+#: ../plugins/build-basic-autotools/plugin.c:2528
+#: ../plugins/build-basic-autotools/plugin.c:2556
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Clean"
 msgstr "�_����วา�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2491
-#: ../plugins/build-basic-autotools/plugin.c:2519
+#: ../plugins/build-basic-autotools/plugin.c:2529
+#: ../plugins/build-basic-autotools/plugin.c:2557
 msgid "Clean module"
 msgstr "�����วา�มอ�ูล"
 
-#: ../plugins/build-basic-autotools/plugin.c:2524
+#: ../plugins/build-basic-autotools/plugin.c:2562
 msgid "_Cancel command"
 msgstr "_ย��ลิ��ำสั��"
 
-#: ../plugins/build-basic-autotools/plugin.c:2525
+#: ../plugins/build-basic-autotools/plugin.c:2563
 msgid "Cancel build command"
 msgstr "ย��ลิ��ำสั���ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/plugin.c:2563
+#: ../plugins/build-basic-autotools/plugin.c:2601
 #, c-format
 msgid "_Build (%s)"
 msgstr "�ระ�อ�_สร�า� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2570
+#: ../plugins/build-basic-autotools/plugin.c:2608
 #, c-format
 msgid "_Install (%s)"
 msgstr "_�ิ��ั�� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2577
+#: ../plugins/build-basic-autotools/plugin.c:2615
 #, c-format
 msgid "_Clean (%s)"
 msgstr "�_����วา� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2585
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile (%s)"
 msgstr "�อ_ม��ล� (%s)"
 
-#: ../plugins/build-basic-autotools/plugin.c:2585
+#: ../plugins/build-basic-autotools/plugin.c:2623
 #, c-format
 msgid "Co_mpile"
 msgstr "�อ_ม��ล�"
 
-#: ../plugins/build-basic-autotools/plugin.c:3122
+#: ../plugins/build-basic-autotools/plugin.c:3159
 msgid "Build commands"
 msgstr "�ำสั���ระ�อ�สร�า�"
 
 #. Translators: This is a group of build
 #. * commands which appears in pop up menus
-#: ../plugins/build-basic-autotools/plugin.c:3131
+#: ../plugins/build-basic-autotools/plugin.c:3168
 msgid "Build popup commands"
 msgstr "�ำสั���ุ��ึ��สำหรั��ระ�อ�สร�า�"
 
-#: ../plugins/build-basic-autotools/plugin.c:3513
-#: ../plugins/build-basic-autotools/plugin.c:3521
+#: ../plugins/build-basic-autotools/plugin.c:3550
+#: ../plugins/build-basic-autotools/plugin.c:3558
 msgid "Build Autotools"
 msgstr "��รื�อ�มืออั���มั�ิสำหรั��ระ�อ�สร�า�"
 
@@ -1003,49 +1009,50 @@ msgid "Command aborted"
 msgstr "�ลิ��ำ�ำสั���ล�ว"
 
 #: ../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.ui.h:2
-msgid "<b>General Class Properties</b>"
-msgstr "<b>�ุ�สม�ั�ิ�ั�ว���อ��ลาส</b>"
-
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
 msgid "Add to Project"
 msgstr "��ิ�ม���า����ร��าร"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:2
 msgid "Add to Repository"
 msgstr "��ิ�ม���า���ลั�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
-msgid "Author Email:"
-msgstr "อี�มล�ู���ีย�:"
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:3
+msgid "Author Email Address:"
+msgstr "�ี�อยู�อี�มล�ู���ีย�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:4
 msgid "Author Name:"
 msgstr "�ื�อ�ู���ีย�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:5
 msgid "Author/Date-Time"
 msgstr "�ู���ีย�/วั��ี�-�วลา"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:6
 msgid "Author/Date/Time"
 msgstr "�ู���ีย�/วั��ี�/�วลา"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:7
 msgid "Base Class Inheritance:"
 msgstr "�ารสื��อ��ลาส�ื���า�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:8
 msgid "Base Class:"
 msgstr "�ลาส�ื���า�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:9
+msgid "Class Elements"
+msgstr "อ����ระ�อ��อ��ลาส"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:10
 msgid "Class Function Prefix:"
 msgstr "�ำ�ำห��า�ั����ั��ลาส:"
 
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:11
+#: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
+msgid "Class Generator"
+msgstr "��รื�อ�มือสร�า��ลาส"
+
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:12
 msgid "Class Name:"
 msgstr "�ื�อ�ลาส:"
@@ -1067,71 +1074,63 @@ msgid "GObject Prefix and Type:"
 msgstr "�ำ�ำห��า�ละ��ิ� GObject:"
 
 #: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:17
-#: ../plugins/file-wizard/file.c:102
-#: ../plugins/project-wizard/templates/translatable-strings.h:47
+msgid "General Class Properties"
+msgstr "�ุ�สม�ั�ิ�ั�ว���อ��ลาส"
+
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/file-wizard/file.c:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:49
 msgid "General Public License (GPL)"
 msgstr "สั��าอ�ุ�า�สา�าร�ะ�ั�ว����ู (GPL)"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:18
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
 msgid "Generic C++ Class"
 msgstr "�ลาส��� generic �อ� C++"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:19
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
 msgid "Header File:"
 msgstr "���มส�ว�หัว:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:20
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
 msgid "Inline the declaration and implementation"
 msgstr "�าร�ระ�าศ�ละ�ัว�ั����ั� inline"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:21
-#: ../plugins/file-wizard/file.c:103
-#: ../plugins/project-wizard/templates/translatable-strings.h:60
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:22
+#: ../plugins/file-wizard/file.c:104
+#: ../plugins/project-wizard/templates/translatable-strings.h:63
 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
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:8
 msgid "License:"
 msgstr "สั��าอ�ุ�า�:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:23
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
 msgid "Member Functions/Variables"
 msgstr "�ั����ั�/�ัว��รสมา�ิ�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:24
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
 msgid "No License"
 msgstr "�ม�มีสั��าอ�ุ�า�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:25
-#: ../plugins/glade/plugin.c:4446
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/glade/plugin.c:4447
 msgid "Properties"
 msgstr "�ุ�สม�ั�ิ"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:26
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
 msgid "Signals"
 msgstr "สั��า�"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:27
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
 msgid "Source File:"
 msgstr "���ม�อร�ส:"
 
-#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:28
+#: ../plugins/class-gen/anjuta-class-gen-plugin.ui.h:29
 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"
@@ -1154,219 +1153,282 @@ msgstr "���ม�ี��ะ��ีย������ลลั��
 msgid "Failed to write autogen definition file"
 msgstr "��ีย����ม��อ�ำห���อ� autogen �ม�สำ�ร��"
 
-#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1040
+#: ../plugins/class-gen/plugin.c:98 ../plugins/project-wizard/druid.c:1048
 msgid ""
-"Could not find autogen version 5, please install the autogen package. You "
-"can get it from http://autogen.sourceforge.net";
+"Could not find autogen version 5; please install the autogen package. You "
+"can get it from http://autogen.sourceforge.net.";
 msgstr ""
-"หา autogen รุ�� 5 �ม��� �รุ�า�ิ��ั�������� autogen �ุ�สามาร��าว���หล�����ี� http://";
+"หา autogen รุ�� 5 �ม��� �รุ�า�ิ��ั�������� autogen �ึ��สามาร��าว���หล�����ี� http://";
 "autogen.sourceforge.net"
 
-#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:412
+#: ../plugins/class-gen/plugin.c:253 ../plugins/class-gen/plugin.c:426
 #, c-format
 msgid "Failed to execute autogen: %s"
 msgstr "�รีย� autogen �ม�สำ�ร��: %s"
 
-#: ../plugins/class-gen/window.c:818
-msgid "XML description of the user interface"
-msgstr "�ำอ�ิ�าย XML �อ�ส�ว��ิ���อ�ู����"
+#: ../plugins/class-gen/window.c:94
+msgid "Guess from type"
+msgstr "��า�า���ิ�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
-msgid "<b>CVS Options</b>"
-msgstr "<b>�ัว�ลือ�สำหรั� CVS</b>"
+#: ../plugins/class-gen/window.c:499 ../plugins/class-gen/window.c:510
+#: ../plugins/search/anjuta-search.ui.h:29
+msgid "Scope"
+msgstr "�อ����"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:2
-msgid "<b>Module Details:</b>"
-msgstr "<b>รายละ�อีย�มอ�ูล:</b>"
+#: ../plugins/class-gen/window.c:500
+msgid "Implementation"
+msgstr "��ื�อหา"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:3
-msgid "<b>Options:</b>"
-msgstr "<b>�ัว�ลือ�:</b>"
+#: ../plugins/class-gen/window.c:501 ../plugins/class-gen/window.c:511
+#: ../plugins/class-gen/window.c:533
+#: ../plugins/debug-manager/breakpoints.c:1907
+#: ../plugins/debug-manager/debug_tree.c:126
+msgid "Type"
+msgstr "��ิ�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
-#: ../plugins/git/anjuta-git.ui.h:1 ../plugins/search/anjuta-search.ui.h:3
-msgid "<b>Options</b>"
-msgstr "<b>�ัว�ลือ�</b>"
+#: ../plugins/class-gen/window.c:502 ../plugins/class-gen/window.c:512
+#: ../plugins/class-gen/window.c:520 ../plugins/class-gen/window.c:534
+#: ../plugins/run-program/parameters.c:752
+#: ../plugins/search/search_preferences.c:534
+msgid "Name"
+msgstr "�ื�อ"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
+#: ../plugins/class-gen/window.c:503 ../plugins/class-gen/window.c:513
+#: ../plugins/class-gen/window.c:535
+#: ../plugins/debug-manager/stack_trace.c:679
+msgid "Arguments"
+msgstr "อาร��ิว�ม���"
+
+#: ../plugins/class-gen/window.c:521
+msgid "Nick"
+msgstr "�ื�อ�ล��"
+
+#: ../plugins/class-gen/window.c:522
+msgid "Blurb"
+msgstr "�ำ�รรยายสั��"
+
+#: ../plugins/class-gen/window.c:523
+msgid "GType"
+msgstr "GType"
+
+#: ../plugins/class-gen/window.c:524
+msgid "ParamSpec"
+msgstr "ParamSpec"
+
+#. Somehow redundant with marshaller, but required for default handler
+#: ../plugins/class-gen/window.c:526 ../plugins/class-gen/window.c:536
+msgid "Flags"
+msgstr "��ล��"
+
+#: ../plugins/class-gen/window.c:537
+msgid "Marshaller"
+msgstr "Marshaller"
+
+#: ../plugins/class-gen/window.c:818
+msgid "XML description of the user interface"
+msgstr "�ำอ�ิ�าย XML �อ�ส�ว��ิ���อ�ู����"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:1
 msgid ""
 "<b>Please note: </b>\n"
 "\n"
-"Pressing OK will delete the file from disk and from CVS. Of course the file "
+"Pressing OK will delete the file from disk and from CVS. Of course, the file "
 "won't be removed from CVS before you use CVS Commit. <b>You have been warned!"
 "</b>"
 msgstr ""
 "<b>��ร�สั����: </b>\n"
 "\n"
-"�าร�� \"��ล�\" �ะล����มออ��า��ิส���ละ CVS ����อ�ว�า���ม�ะ�ม��ู�ล�ออ��า� CVS "
+"�าร�� \"��ล�\" �ะ�����ารล����มออ��า��ิส���ละ CVS ����อ�ว�า���ม�ะยั��ม��ู�ล�ออ��า� CVS "
 "���ว�า�ุ��ะสั�� CVS Commit <b>�รา��ือ��ุ��ล�ว!</b>"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
-msgid "<b>Repository: </b>"
-msgstr "<b>�ลั�: </b>"
-
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:4
 msgid "Be verbose"
 msgstr "�ส����อ�วามอย�า�ละ�อีย�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:22
 #: ../plugins/subversion/anjuta-subversion.ui.h:3
-#: ../plugins/tools/anjuta-tools.ui.h:2
-msgid "Browse..."
-msgstr "�รีย��ู..."
+#: ../plugins/tools/anjuta-tools.ui.h:1
+msgid "Browseâ?¦"
+msgstr "�รีย��ู�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:6
+msgid "CVS Options"
+msgstr "�ัว�ลือ�สำหรั� CVS"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:7
 msgid "CVS Preferences"
 msgstr "�าร�รั�����สำหรั� CVS"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:8
 msgid "CVS: Add file/directory"
 msgstr "CVS: ��ิ�ม���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:9
 msgid "CVS: Commit file/directory"
 msgstr "CVS: commit ���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:10
 msgid "CVS: Diff file/directory"
 msgstr "CVS: Diff ���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:11
 msgid "CVS: Import"
 msgstr "CVS: �ำ���า"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:12
 msgid "CVS: Log file/directory"
 msgstr "CVS: �ั��ึ��ูม���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:13
 msgid "CVS: Remove file/directory"
 msgstr "CVS: ล����ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:14
 msgid "CVS: Status"
 msgstr "CVS: ส�า�ะ"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:15
 msgid "CVS: Status from file/directory"
 msgstr "CVS: ส�า�ะ�า����ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:16
 msgid "CVS: Update file/directory"
 msgstr "CVS: �รั���อมูล���ม/���ร��อรี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:17
 msgid "CVSROOT:"
 msgstr "CVSROOT:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:18
 #: ../plugins/subversion/anjuta-subversion.ui.h:5
 msgid "Choose file or directory to add:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ��ิ�ม:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:19
 msgid "Choose file or directory to commit:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ commit:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:20
 msgid "Choose file or directory to diff:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ diff:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
-msgid "Choose file or directory to get log:"
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:21
+msgid "Choose file or directory to get log for:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ�ู�ูม:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:22
 msgid "Choose file or directory to get the status from:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ�ูส�า�ะ:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:23
 msgid "Choose file or directory to remove:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะล�ออ�:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:24
 #: ../plugins/subversion/anjuta-subversion.ui.h:6
 msgid "Choose file or directory to update:"
 msgstr "�ลือ����มหรือ���ร��อรี�ี��ะ�รั���อมูล:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:25
 msgid "Compression Level (0=off, 10=max):"
 msgstr "ระ�ั��าร�ี� (0=�ม��ี�, 10=สู�สุ�):"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:26
 msgid "Create new directories"
 msgstr "สร�า����ร��อรี�หม�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:27
 msgid "Delete empty directories"
 msgstr "ล����ร��อรีว�า�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:28
 #: ../plugins/subversion/anjuta-subversion.ui.h:13
 msgid "Do not act recursively"
 msgstr "�ม��ำ�����ร��อรีย�อย"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:29
 msgid "Extern (rsh)"
 msgstr "ภาย�อ� (rsh)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:30
 msgid "File is binary"
 msgstr "���ม�������ารี"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:31
 msgid "Ignore .cvsrc file (recommended)"
 msgstr "�ม�ส������ม .cvsrc (��ะ�ำ)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
-#: ../plugins/git/anjuta-git.ui.h:62 ../plugins/symbol-db/plugin.c:2333
-#: ../plugins/symbol-db/plugin.c:2397
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:57 ../plugins/symbol-db/plugin.c:2359
+#: ../plugins/symbol-db/plugin.c:2422
 msgid "Local"
 msgstr "���าะ�ี�"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
-#: ../plugins/git/anjuta-git.ui.h:64
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:59
 msgid "Log message:"
 msgstr "��อ�วาม�ูม:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:34
+msgid "Module Details:"
+msgstr "รายละ�อีย�มอ�ูล:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:35
 msgid "Module name:"
 msgstr "�ื�อมอ�ูล:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:36
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:65 ../plugins/glade/plugin.c:3098
+#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
+#: ../plugins/subversion/anjuta-subversion.ui.h:23
+msgid "Options"
+msgstr "�ัว�ลือ�"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/subversion/anjuta-subversion.ui.h:24
+msgid "Options:"
+msgstr "�ัว�ลือ�:"
+
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:38
 msgid "Password server (pserver)"
 msgstr "��ิร���วอร�รหัส��า� (pserver)"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:39
 #: ../plugins/subversion/anjuta-subversion.ui.h:26
 msgid "Password:"
 msgstr "รหัส��า�:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:40
 msgid "Patch-Style diff"
 msgstr "diff ��������"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:41
 msgid "Path to \"cvs\" command"
 msgstr "�า��ำสั�� \"cvs\""
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:42
 msgid "Project root directory:"
 msgstr "���ร��อรีรา��อ���ร��าร:"
 
-#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:43
 msgid "Release tag:"
 msgstr "�����ารออ�รุ��:"
 
+#: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:44
+msgid "Repository:"
+msgstr "�ลั�:"
+
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:45
 msgid "Reset sticky tags"
 msgstr "ล�า���า���� sticky"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:46
-#: ../plugins/git/anjuta-git.ui.h:91
-#: ../plugins/subversion/anjuta-subversion.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/subversion/anjuta-subversion.ui.h:38
 msgid "Revision:"
 msgstr "��ั������:"
 
@@ -1379,7 +1441,7 @@ msgid "Unified format instead of context format"
 msgstr "���รู���� unified ���รู���� context"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:49
-#: ../plugins/subversion/anjuta-subversion.ui.h:54
+#: ../plugins/subversion/anjuta-subversion.ui.h:55
 msgid "Use revision/tag:"
 msgstr "�����ั������/����:"
 
@@ -1388,7 +1450,7 @@ msgid "Use revision:"
 msgstr "�����ั������:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:51
-#: ../plugins/subversion/anjuta-subversion.ui.h:55
+#: ../plugins/subversion/anjuta-subversion.ui.h:56
 msgid "Username:"
 msgstr "�ื�อ�ู����:"
 
@@ -1397,8 +1459,8 @@ msgid "Vendor tag:"
 msgstr "�����อ��ู��ั����:"
 
 #: ../plugins/cvs-plugin/anjuta-cvs-plugin.ui.h:53
-#: ../plugins/git/anjuta-git.ui.h:125
-#: ../plugins/subversion/anjuta-subversion.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/subversion/anjuta-subversion.ui.h:61
 msgid "Whole project"
 msgstr "�ั����ร��าร"
 
@@ -1432,7 +1494,7 @@ msgid "CVSROOT"
 msgstr "CVSROOT"
 
 #: ../plugins/cvs-plugin/cvs-callbacks.c:438
-#: ../plugins/gbf-am/gbf-am-properties.c:1234
+#: ../plugins/gbf-am/gbf-am-properties.c:1237
 msgid "Module"
 msgstr "มอ�ูล"
 
@@ -1449,18 +1511,18 @@ msgid "Are you sure that you do not want a log message?"
 msgstr "ยื�ยั�ว�า�ม���อ��าร�ั��ึ��ูม��อ�วาม����หม?"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:125
-msgid "CVS command failed - See above for details"
-msgstr "�ำสั�� CVS ล�ม�หลว - �ูรายละ�อีย���า���"
+msgid "CVS command failed. See above for details"
+msgstr "�ำสั�� CVS ล�ม�หลว �ูรายละ�อีย���า���"
 
 #: ../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 วิ�า�ี"
+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:221
-msgid "CVS command is running - please wait until it finishes!"
-msgstr "�ำสั�� CVS �ำลั��ำ�า� - �รุ�ารอ���ว�า�ะ�สร��!"
+msgid "CVS command is running â?? please wait until it finishes!"
+msgstr "à¸?ำสัà¹?à¸? CVS à¸?ำลัà¸?à¸?ำà¸?าà¸? â?? à¸?รุà¸?ารอà¸?à¸?à¸?วà¹?าà¸?ะà¹?สรà¹?à¸?!"
 
 #: ../plugins/cvs-plugin/cvs-execute.c:229
 #: ../plugins/cvs-plugin/cvs-execute.c:233 ../plugins/cvs-plugin/plugin.c:467
@@ -1520,8 +1582,8 @@ msgstr "_�รั���อมูล"
 #. Display label
 #. short-cut
 #: ../plugins/cvs-plugin/plugin.c:78 ../plugins/cvs-plugin/plugin.c:137
-msgid "Sync your local copy with the CVS tree"
-msgstr "�รั���อมูล����รื�อ��อ��ุ��ห��ร��ั� CVS tree"
+msgid "Syncronize your local copy with the CVS tree"
+msgstr "�รั���อมูล����รื�อ��อ��ุ��ห��ร��ั� tree �� CVS"
 
 #. Action name
 #. Stock icon, if any
@@ -1580,138 +1642,138 @@ msgid "CVS popup operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั� CVS ���ม�ู�ุ��ึ��"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:1
-msgid "<b>Debugger:</b>"
-msgstr "<b>��ร��รม�ี�ั��:</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:2
-msgid "<b>Remote debugging</b>"
-msgstr "<b>�าร�ี�ั����า���รือ��าย</b>"
-
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to debug a "
-"program not using the Debug configuration ?</span>\n"
+"program not using the Debug configuration?</span>\n"
 "\n"
 "When optimizations are enabled, the debugger cannot always identify the "
-"source code corresponding to the instructions, some commands can perform in "
-"a strange way, especially steps."
+"source code corresponding to the instructions, so some commands can perform "
+"in a strange way, especially steps."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">�ุ������หรือ�ม� "
 "ว�า��อ��าร�ี�ั����ร��รม�ี��ม�����ั����า�ว�สำหรั��ี�ั��?</span>\n"
 "\n"
-"�มื�อ��ิ�����าร�รั��ระสิ��ิภา� ��ร��รม�ี�ั���ะ�ม�สามาร�ระ�ุ�อร�ส�����ี��ร��ั��ำสั����า�� ��� "
-"�ำสั���า��ำสั��อา��ำ�า��ิ���ี�ย� ��ย���าะ�าร�ำ�ำสั���ีละ�ั��"
+"�มื�อ��ิ�����าร�รั��ระสิ��ิภา� ��ร��รม�ี�ั���ะ�ม�สามาร�ระ�ุ�อร�ส�����ี��ร��ั��ำสั����า�� "
+"����สมอ�� �ำสั���า��ำสั���ึ�อา��ำ�า��ิ���ี�ย� ��ย���าะ�าร�ำ�ำสั���ีละ�ั��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:4
 msgid "Add Watch"
 msgstr "��ิ�ม�าร���า�ู"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:5
 msgid "Address:"
 msgstr "�อ���รส:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:6
 msgid "Attach to process"
 msgstr "����ั���ร��ส"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:7
 msgid "Breakpoint properties"
 msgstr "�ุ�สม�ั�ิ�ุ��ั�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:8
 #: ../plugins/debug-manager/breakpoints.c:1980
 msgid "Breakpoints"
 msgstr "�ุ��ั�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:9
 msgid "CPU Registers"
 msgstr "�ร�ิส��อร��อ� CPU"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:10
 msgid "Change Watch"
 msgstr "��ลี�ย��าร���า�ู"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:11
 msgid "Connect to remote target"
 msgstr "��ื�อม��อ��ยั����าหมาย����รือ��าย"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:12
 msgid "Debugger command"
 msgstr "�ำสั����ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:13
 msgid "Debugger command:"
 msgstr "�ำสั����ร��รม�ี�ั��:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
-#: ../plugins/project-wizard/templates/translatable-strings.h:33
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:14
+msgid "Debugger:"
+msgstr "��ร��รม�ี�ั��:"
+
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:35
 msgid "Description:"
 msgstr "�ำอ�ิ�าย:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:16
 msgid "Disable"
 msgstr "�ิ�����า�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:17
 msgid "Display process _tree"
 msgstr "�ส��_ลำ�ั��ั���อ���ร��ส"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:18
 msgid "Do not show again"
 msgstr "�ม���อ��ส��อี�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:19
 msgid "Enable _all"
 msgstr "��ิ�����า�_�ั��หม�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:20
 msgid "Enter an address in hexadecimal or select one in the data"
 msgstr "��อ��อ���รส�����ล��า�สิ�ห�หรือ�ลือ��า���อมูล"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:21
 msgid "Hide process para_meters"
 msgstr "��อ��ารา_มิ��อร���ร��ส"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:22
 msgid "Inspect"
 msgstr "�รว�สอ�"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:23
 msgid "Inspect/Evaluate"
 msgstr "�รว�สอ�/�ระมวล�ล"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:24
 #: ../plugins/debug-manager/plugin.c:945
 #: ../plugins/debug-manager/plugin.c:1045
 msgid "Kernel Signals"
 msgstr "สั��า���อร���ล"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:25
 #: ../plugins/debug-manager/breakpoints.c:1907
 msgid "Location"
 msgstr "�ำ�ห���"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:26
 #: ../plugins/debug-manager/memory.c:180
 msgid "Memory"
 msgstr "ห��วย�วาม�ำ"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:27
 msgid "Pass:"
 msgstr "��า�:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:28
 msgid "Port:"
 msgstr "�อร��:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:29
 msgid "Print:"
 msgstr "�ิม��:"
 
-#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:30
 msgid "Program Interrupt"
 msgstr "�ั��ั�หวะ��ร��รม"
 
+#: ../plugins/debug-manager/anjuta-debug-manager.ui.h:31
+msgid "Remote debugging"
+msgstr "�าร�ี�ั����า���รือ��าย"
+
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:32
 msgid "SIGINT"
 msgstr "SIGINT"
@@ -1754,7 +1816,7 @@ msgid "TCP/IP Connection"
 msgstr "�าร��ื�อม��อ TCP/IP"
 
 #: ../plugins/debug-manager/anjuta-debug-manager.ui.h:42
-#: ../plugins/project-wizard/property.c:286
+#: ../plugins/project-wizard/property.c:309
 msgid "Yes"
 msgstr "���"
 
@@ -1828,8 +1890,8 @@ msgstr "สลั��ุ��ั��ี��ำ�ห����ั��
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/breakpoints.c:1786
-msgid "Add Breakpoint..."
-msgstr "��ิ�ม�ุ��ั�..."
+msgid "Add Breakpointâ?¦"
+msgstr "��ิ�ม�ุ��ั��"
 
 #. Display label
 #. short-cut
@@ -1920,7 +1982,7 @@ msgid "Disable a breakpoint"
 msgstr "หยุ��ำ�า��ุ��ั�"
 
 #: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/tools/anjuta-tools.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:5
 msgid "Enabled"
 msgstr "��ิ�����า�"
 
@@ -1930,11 +1992,6 @@ msgstr "��ิ�����า�"
 msgid "Address"
 msgstr "�อ���รส"
 
-#: ../plugins/debug-manager/breakpoints.c:1907
-#: ../plugins/debug-manager/debug_tree.c:126
-msgid "Type"
-msgstr "��ิ�"
-
 #: ../plugins/debug-manager/breakpoints.c:1908
 msgid "Condition"
 msgstr "��ื�อ���"
@@ -1953,20 +2010,20 @@ msgid "Breakpoint operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��ุ��ั�"
 
 #. create goto menu_item.
-#: ../plugins/debug-manager/data_view.c:390
-#: ../plugins/debug-manager/sparse_view.c:498
-msgid "_Goto address"
+#: ../plugins/debug-manager/data_view.c:386
+#: ../plugins/debug-manager/sparse_view.c:491
+msgid "_Go to address"
 msgstr "�_�ยั��อ���รส"
 
 #: ../plugins/debug-manager/debug_tree.c:126
-#: ../plugins/gbf-am/gbf-am-properties.c:971 ../plugins/tools/editor.c:468
+#: ../plugins/gbf-am/gbf-am-properties.c:974 ../plugins/tools/editor.c:468
 msgid "Variable"
 msgstr "�ัว��ร"
 
 #: ../plugins/debug-manager/debug_tree.c:126
 #: ../plugins/debug-manager/registers.c:469
-#: ../plugins/gbf-am/gbf-am-properties.c:981
-#: ../plugins/run-program/parameters.c:758 ../plugins/tools/editor.c:474
+#: ../plugins/gbf-am/gbf-am-properties.c:984
+#: ../plugins/run-program/parameters.c:761 ../plugins/tools/editor.c:474
 msgid "Value"
 msgstr "��า"
 
@@ -2008,8 +2065,8 @@ msgid "Loaded"
 msgstr "�หล��ล�ว"
 
 #: ../plugins/debug-manager/plugin.c:429
-msgid "Running..."
-msgstr "�ำลั��ำ�า�..."
+msgid "Runningâ?¦"
+msgstr "�ำลั��ำ�า��"
 
 #: ../plugins/debug-manager/plugin.c:451
 msgid "Stopped"
@@ -2048,16 +2105,16 @@ msgid "Start debugger and load the program"
 msgstr "�รีย���ร��รม�ี�ั���ร�อม�หล���ร��รม"
 
 #: ../plugins/debug-manager/plugin.c:853
-msgid "_Debug Process..."
-msgstr "�ี�ั���_�ร��ส..."
+msgid "_Debug Processâ?¦"
+msgstr "�ี�ั���_�ร��ส�"
 
 #: ../plugins/debug-manager/plugin.c:855
 msgid "Start debugger and attach to a running program"
 msgstr "�ริ�ม��ร��รม�ี�ั���ละ����ั���ร��รม�ี��ำลั��ำ�า�"
 
 #: ../plugins/debug-manager/plugin.c:861
-msgid "Debug _Remote Target..."
-msgstr "�ี�ั�����าหมาย���_�รือ��าย..."
+msgid "Debug _Remote Targetâ?¦"
+msgstr "�ี�ั�����าหมาย���_�รือ��าย�"
 
 #: ../plugins/debug-manager/plugin.c:863
 msgid "Connect to a remote debugging target"
@@ -2072,8 +2129,8 @@ msgid "Say goodbye to the debugger"
 msgstr "�อ�ลา��ร��รม�ี�ั��"
 
 #: ../plugins/debug-manager/plugin.c:877
-msgid "Add source paths..."
-msgstr "��ิ�ม�า��อ��อร�ส..."
+msgid "Add source pathsâ?¦"
+msgstr "��ิ�ม�า��อ��อร�ส�"
 
 #: ../plugins/debug-manager/plugin.c:879
 msgid "Add additional source paths"
@@ -2082,8 +2139,8 @@ msgstr "��ิ�ม�า��อ��อร�ส"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/plugin.c:889 ../plugins/debug-manager/plugin.c:997
-msgid "Debugger Command..."
-msgstr "�ำสั����ร��รม�ี�ั��..."
+msgid "Debugger Commandâ?¦"
+msgstr "�ำสั����ร��รม�ี�ั���"
 
 #. Display label
 #. short-cut
@@ -2127,7 +2184,7 @@ msgstr "�ล�รารี���ร�วม"
 
 #: ../plugins/debug-manager/plugin.c:939
 #: ../plugins/debug-manager/plugin.c:1039
-msgid "Show shared libraries mappings"
+msgid "Show shared library mappings"
 msgstr "�ส���ั��าร����ล�รารี���ร�วม"
 
 #: ../plugins/debug-manager/plugin.c:947
@@ -2168,7 +2225,7 @@ msgid "Step _Out"
 msgstr "��าว_ออ�"
 
 #: ../plugins/debug-manager/plugin.c:983
-msgid "Single step out of the function"
+msgid "Single step out of function"
 msgstr "�ำห�ึ���ั��ออ��า��ั����ั�"
 
 #: ../plugins/debug-manager/plugin.c:989
@@ -2222,11 +2279,10 @@ msgstr "หยุ��ั��าร�ำ�า��อ���ร��ร
 msgid "Debugger operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/queue.c:543
+#: ../plugins/debug-manager/queue.c:524
 #, c-format
-msgid ""
-"Unable to find one debugger plugin supporting a target with %s mime type"
-msgstr "�ม����ลั��อิ��ี�ั���ี�รอ�รั����าหมาย�ี�������ิ� mime %s"
+msgid "Unable to find a debugger plugin supporting a target with %s MIME type"
+msgstr "�ม����ลั��อิ��ี�ั���ี�รอ�รั����าหมาย�ี�������ิ� MIME %s"
 
 #: ../plugins/debug-manager/registers.c:462
 msgid "Register"
@@ -2245,11 +2301,11 @@ msgstr "�รั���อมูล"
 msgid "Shared Object"
 msgstr "อ�อ���������ร�วม"
 
-#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:54
+#: ../plugins/debug-manager/sharedlib.c:173 ../plugins/git/anjuta-git.ui.h:49
 msgid "From"
 msgstr "�า�"
 
-#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:116
+#: ../plugins/debug-manager/sharedlib.c:180 ../plugins/git/anjuta-git.ui.h:114
 msgid "To"
 msgstr "�ึ�"
 
@@ -2257,7 +2313,7 @@ msgstr "�ึ�"
 msgid "Symbols read"
 msgstr "อ�า�สั�ลั�ษ���ล�ว"
 
-#: ../plugins/debug-manager/sharedlib.c:338
+#: ../plugins/debug-manager/sharedlib.c:341
 msgid "Shared library operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��ล�รารี���ร�วม"
 
@@ -2291,24 +2347,24 @@ msgstr "ส�����ี���ร��ส"
 msgid "Kernel signals"
 msgstr "สั��า���อร���ล"
 
-#: ../plugins/debug-manager/signals.c:474
-#: ../plugins/debug-manager/signals.c:480
+#: ../plugins/debug-manager/signals.c:477
+#: ../plugins/debug-manager/signals.c:483
 msgid "Signal operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั�สั��า�"
 
-#: ../plugins/debug-manager/sparse_view.c:1202
+#: ../plugins/debug-manager/sparse_view.c:1200
 msgid "Show Line Numbers"
 msgstr "�ส���ล��รร�ั�"
 
-#: ../plugins/debug-manager/sparse_view.c:1203
+#: ../plugins/debug-manager/sparse_view.c:1201
 msgid "Whether to display line numbers"
 msgstr "�ะ�ส���ล��รร�ั�หรือ�ม�"
 
-#: ../plugins/debug-manager/sparse_view.c:1210
+#: ../plugins/debug-manager/sparse_view.c:1208
 msgid "Show Line Markers"
 msgstr "�ส����รื�อ�หมาย�ำ�ั��รร�ั�"
 
-#: ../plugins/debug-manager/sparse_view.c:1211
+#: ../plugins/debug-manager/sparse_view.c:1209
 msgid "Whether to display line marker pixbufs"
 msgstr "�ะ�ส��รู���รื�อ�หมาย�ำ�ั��รร�ั�หรือ�ม�"
 
@@ -2342,7 +2398,7 @@ msgstr "���ม"
 
 #: ../plugins/debug-manager/stack_trace.c:642
 #: ../plugins/debug-manager/threads.c:460
-#: ../plugins/document-manager/plugin.c:921
+#: ../plugins/document-manager/plugin.c:941
 msgid "Line"
 msgstr "�รร�ั�"
 
@@ -2351,10 +2407,6 @@ msgstr "�รร�ั�"
 msgid "Function"
 msgstr "�ั����ั�"
 
-#: ../plugins/debug-manager/stack_trace.c:679
-msgid "Arguments"
-msgstr "อาร��ิว�ม���"
-
 #: ../plugins/debug-manager/stack_trace.c:703
 msgid "Stack"
 msgstr "ส����"
@@ -2363,47 +2415,47 @@ msgstr "ส����"
 msgid "Stack frame operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���รม�อ�ส����"
 
-#: ../plugins/debug-manager/start.c:98
-msgid "Pid"
-msgstr "Pid"
+#: ../plugins/debug-manager/start.c:99
+msgid "PID"
+msgstr "PID"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "User"
 msgstr "�ู����"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "Time"
 msgstr "�วลา"
 
-#: ../plugins/debug-manager/start.c:98
+#: ../plugins/debug-manager/start.c:99
 msgid "Command"
 msgstr "�ำสั��"
 
-#: ../plugins/debug-manager/start.c:627
+#: ../plugins/debug-manager/start.c:628
 #, c-format
 msgid "Unable to execute: %s."
 msgstr "�ม�สามาร��รีย��ำ�า�: %s"
 
-#: ../plugins/debug-manager/start.c:641
+#: ../plugins/debug-manager/start.c:642
 #, c-format
 msgid "Unable to open the file: %s\n"
 msgstr "�ม�สามาร���ิ����ม: %s\n"
 
-#: ../plugins/debug-manager/start.c:965
+#: ../plugins/debug-manager/start.c:966
 #, c-format
 msgid "Unable to open %s. Debugger cannot start."
 msgstr "�ม�สามาร���ิ� %s �ม�สามาร��ริ�ม��ร��รม�ี�ั�����"
 
-#: ../plugins/debug-manager/start.c:975
+#: ../plugins/debug-manager/start.c:976
 #, c-format
-msgid "Unable to detect mime-type of %s. Debugger cannot start."
-msgstr "�ม�สามาร��รว�หา��ิ� mime �อ� %s ��� �ม�สามาร��ริ�ม��ร��รม�ี�ั�����"
+msgid "Unable to detect MIME type of %s. Debugger cannot start."
+msgstr "�ม�สามาร��รว�หา��ิ� MIME �อ� %s ��� �ม�สามาร��ริ�ม��ร��รม�ี�ั��"
 
-#: ../plugins/debug-manager/start.c:1336
+#: ../plugins/debug-manager/start.c:1337
 msgid "Path"
 msgstr "�า�"
 
-#: ../plugins/debug-manager/start.c:1385 ../plugins/gdb/debugger.c:1699
+#: ../plugins/debug-manager/start.c:1386 ../plugins/gdb/debugger.c:1738
 msgid ""
 "The program is running.\n"
 "Do you still want to stop the debugger?"
@@ -2418,8 +2470,8 @@ msgid "Set current thread"
 msgstr "�ำห����ร��ั��ุ�ั�"
 
 #: ../plugins/debug-manager/threads.c:436
-msgid "Id"
-msgstr "หมาย�ล�"
+msgid "ID"
+msgstr "ID"
 
 #: ../plugins/debug-manager/threads.c:506
 msgid "Thread"
@@ -2432,8 +2484,8 @@ msgstr "�าร�ระ�ำ��ี�ยว�ั���ร�"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/debug-manager/watch.c:372
-msgid "Ins_pect/Evaluate..."
-msgstr "�รว�_สอ�/�ระมวล�ล..."
+msgid "Ins_pect/Evaluateâ?¦"
+msgstr "�รว�_สอ�/�ระมวล�ล�"
 
 #. Display label
 #. short-cut
@@ -2442,8 +2494,8 @@ msgid "Inspect or evaluate an expression or variable"
 msgstr "�รว�สอ�หรือ�ระมวล�ล�ิ����หรือ�ัว��ร"
 
 #: ../plugins/debug-manager/watch.c:380
-msgid "Add Watch..."
-msgstr "��ิ�ม�าร���า�ู..."
+msgid "Add Watchâ?¦"
+msgstr "��ิ�ม�าร���า�ู�"
 
 #: ../plugins/debug-manager/watch.c:388
 msgid "Remove Watch"
@@ -2483,9 +2535,9 @@ msgstr "���า�ู"
 msgid "Search Help:"
 msgstr "���วิ�ี���:"
 
-#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:236
-#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:309
-msgid "_Goto"
+#: ../plugins/devhelp/plugin.c:222 ../plugins/document-manager/plugin.c:239
+#: ../plugins/message-view/plugin.c:76 ../plugins/symbol-db/plugin.c:313
+msgid "_Go to"
 msgstr "�_�ยั�"
 
 #: ../plugins/devhelp/plugin.c:231
@@ -2524,8 +2576,8 @@ msgstr "��ื�อหา"
 #: ../plugins/search/search-replace.c:1717
 #: ../plugins/search/search-replace.c:1724
 #: ../plugins/search/search-replace.c:1736
-#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2335
-#: ../plugins/symbol-db/plugin.c:2447
+#: ../plugins/search/search-replace.c:2065 ../plugins/symbol-db/plugin.c:2361
+#: ../plugins/symbol-db/plugin.c:2472
 msgid "Search"
 msgstr "���หา"
 
@@ -2542,7 +2594,7 @@ msgstr "�ส��วิ�ี���"
 msgid "Online"
 msgstr "ออ��ล��"
 
-#: ../plugins/document-manager/action-callbacks.c:276
+#: ../plugins/document-manager/action-callbacks.c:277
 #, c-format
 msgid ""
 "Are you sure you want to reload '%s'?\n"
@@ -2551,44 +2603,53 @@ msgstr ""
 "ยื�ยั�ว�า��อ��าร�รีย� '%s' �หม�หรือ�ม�?\n"
 "�าร��ลี�ย���ล��ี�ยั��ม��ั��ึ��ะสู�หาย�ั��หม�"
 
-#: ../plugins/document-manager/action-callbacks.c:285
+#: ../plugins/document-manager/action-callbacks.c:286
 msgid "_Reload"
 msgstr "�_รีย��หม�"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:235
+#: ../plugins/document-manager/anjuta-bookmarks.c:311
 msgid "Add bookmark"
 msgstr "��ิ�ม�ี��ั��ห��า"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:241
+#: ../plugins/document-manager/anjuta-bookmarks.c:317
 msgid "Remove bookmark"
 msgstr "ล��ี��ั��ห��า"
 
-#: ../plugins/document-manager/anjuta-bookmarks.c:255
-#: ../plugins/document-manager/anjuta-bookmarks.c:300
-#: ../plugins/document-manager/plugin.c:411
+#: ../plugins/document-manager/anjuta-bookmarks.c:331
+#: ../plugins/document-manager/anjuta-bookmarks.c:393
+#: ../plugins/document-manager/plugin.c:418
 msgid "Bookmarks"
 msgstr "�ี��ั��ห��า"
 
-#: ../plugins/document-manager/anjuta-docman.c:400
+#: ../plugins/document-manager/anjuta-bookmarks.c:339
+msgid "Rename"
+msgstr "��ลี�ย��ื�อ"
+
+#: ../plugins/document-manager/anjuta-bookmarks.c:340
+#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
+msgid "Remove"
+msgstr "ล�"
+
+#: ../plugins/document-manager/anjuta-docman.c:399
 msgid "Close file"
 msgstr "�ิ����ม"
 
-#: ../plugins/document-manager/anjuta-docman.c:448
+#: ../plugins/document-manager/anjuta-docman.c:447
 msgid "Path:"
 msgstr "�า�:"
 
-#: ../plugins/document-manager/anjuta-docman.c:565
+#: ../plugins/document-manager/anjuta-docman.c:564
 #: ../plugins/file-loader/plugin.c:591 ../plugins/file-loader/plugin.c:894
 #: ../plugins/file-loader/plugin.c:904 ../plugins/file-loader/plugin.c:917
 msgid "Open file"
 msgstr "��ิ����ม"
 
-#: ../plugins/document-manager/anjuta-docman.c:584
+#: ../plugins/document-manager/anjuta-docman.c:583
 #: ../plugins/message-view/message-view.c:94
 msgid "Save file as"
 msgstr "�ั��ึ����ม����"
 
-#: ../plugins/document-manager/anjuta-docman.c:665
+#: ../plugins/document-manager/anjuta-docman.c:664
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -2597,37 +2658,37 @@ msgstr ""
 "มี���ม '%s' อยู���อ��ล�ว\n"
 "�ุ���อ��าร�ั��ึ��ั�หรือ�ม�?"
 
-#: ../plugins/document-manager/anjuta-docman.c:674
+#: ../plugins/document-manager/anjuta-docman.c:673
 msgid "_Replace"
 msgstr "�_���ี�"
 
-#: ../plugins/document-manager/anjuta-docman.c:1392
+#: ../plugins/document-manager/anjuta-docman.c:1390
 msgid "[read-only]"
 msgstr "[อ�า�อย�า���ียว]"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:1
-msgid "<b>Autosave</b>"
-msgstr "<b>�าร�ั��ึ�อั���มั�ิ</b>"
+msgid "Autosave"
+msgstr "�าร�ั��ึ�อั���มั�ิ"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:2
-msgid "<b>Editor tabs</b>"
-msgstr "<b>��������รื�อ�มือ�����</b>"
-
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
 msgid "Bottom"
 msgstr "ล�า�"
 
-#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:3
 msgid "Do not show tabs"
 msgstr "�ม��ส������"
 
+#: ../plugins/document-manager/anjuta-document-manager.ui.h:4
+msgid "Editor tabs"
+msgstr "��������รื�อ�มือ�����"
+
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:5
 msgid "Enable files autosave"
 msgstr "��ิ�����า��าร�ั��ึ����มอั���มั�ิ"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:6
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
 msgid "Left"
 msgstr "��าย"
 
@@ -2636,7 +2697,7 @@ msgid "Position:"
 msgstr "�ำ�ห���:"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:8
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
 msgid "Right"
 msgstr "�วา"
 
@@ -2661,172 +2722,172 @@ msgid "Sorted in opening order"
 msgstr "�รีย��ามลำ�ั��าร��ิ�"
 
 #: ../plugins/document-manager/anjuta-document-manager.ui.h:14
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
 msgid "Top"
 msgstr "��"
 
-#: ../plugins/document-manager/plugin.c:147
+#: ../plugins/document-manager/plugin.c:150
 msgid "_Save"
 msgstr "_�ั��ึ�"
 
-#: ../plugins/document-manager/plugin.c:148
+#: ../plugins/document-manager/plugin.c:151
 msgid "Save current file"
 msgstr "�ั��ึ����ม�ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:149
-msgid "Save _As..."
-msgstr "�ั��ึ����_�..."
+#: ../plugins/document-manager/plugin.c:152
+msgid "Save _Asâ?¦"
+msgstr "�ั��ึ����_��"
 
-#: ../plugins/document-manager/plugin.c:150
+#: ../plugins/document-manager/plugin.c:153
 msgid "Save the current file with a different name"
 msgstr "�ั��ึ����ม�ั��ุ�ั������ื�ออื��"
 
-#: ../plugins/document-manager/plugin.c:152
+#: ../plugins/document-manager/plugin.c:155
 msgid "Save A_ll"
 msgstr "�ั��ึ�_�ั��หม�"
 
-#: ../plugins/document-manager/plugin.c:153
+#: ../plugins/document-manager/plugin.c:156
 msgid "Save all currently open files, except new files"
 msgstr "�ั��ึ����ม�ี���ิ�อยู��ั��หม� ย��ว�����ม�หม�"
 
-#: ../plugins/document-manager/plugin.c:155
+#: ../plugins/document-manager/plugin.c:158
 msgid "_Close File"
 msgstr "�ิ_����ม"
 
-#: ../plugins/document-manager/plugin.c:156
+#: ../plugins/document-manager/plugin.c:159
 msgid "Close current file"
 msgstr "�ิ����ม�ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:158
+#: ../plugins/document-manager/plugin.c:161
 msgid "Close All"
 msgstr "�ิ��ั��หม�"
 
-#: ../plugins/document-manager/plugin.c:159
+#: ../plugins/document-manager/plugin.c:162
 msgid "Close all files"
 msgstr "�ิ����ม�ั��หม�"
 
-#: ../plugins/document-manager/plugin.c:161
+#: ../plugins/document-manager/plugin.c:164
 msgid "Reload F_ile"
 msgstr "�_รีย����ม�หม�"
 
-#: ../plugins/document-manager/plugin.c:162
+#: ../plugins/document-manager/plugin.c:165
 msgid "Reload current file"
 msgstr "�รีย����ม�ั��ุ�ั��หม�"
 
-#: ../plugins/document-manager/plugin.c:164
+#: ../plugins/document-manager/plugin.c:167
 msgid "Recent _Files"
 msgstr "���ม_ล�าสุ�"
 
-#: ../plugins/document-manager/plugin.c:168
-msgid "_Print..."
-msgstr "_�ิม��..."
+#: ../plugins/document-manager/plugin.c:171
+msgid "_Printâ?¦"
+msgstr "_�ิม���"
 
-#: ../plugins/document-manager/plugin.c:169
+#: ../plugins/document-manager/plugin.c:172
 msgid "Print the current file"
 msgstr "�ิม�����ม�ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:176
+#: ../plugins/document-manager/plugin.c:179
 msgid "_Print Preview"
 msgstr "_�ัวอย�า���อ��ิม��"
 
-#: ../plugins/document-manager/plugin.c:177
-msgid "Preview the current file in print-format"
+#: ../plugins/document-manager/plugin.c:180
+msgid "Preview the current file in print format"
 msgstr "�ส���ัวอย�า����ม�ั��ุ�ั���อ��ิม��"
 
-#: ../plugins/document-manager/plugin.c:182
+#: ../plugins/document-manager/plugin.c:185
 msgid "_Transform"
 msgstr "�_�ล�"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:183
+#: ../plugins/document-manager/plugin.c:186
 msgid "_Make Selection Uppercase"
 msgstr "��ล�ส�ว��ี��ลือ������ัว�ิม���_ห��"
 
-#: ../plugins/document-manager/plugin.c:184
+#: ../plugins/document-manager/plugin.c:187
 msgid "Make the selected text uppercase"
 msgstr "��ล���อ�วาม�ี��ลือ��ห������ัว�ิม���ห��"
 
-#: ../plugins/document-manager/plugin.c:186
+#: ../plugins/document-manager/plugin.c:189
 msgid "Make Selection Lowercase"
 msgstr "��ล�ส�ว��ี��ลือ������ัว�ิม���_ล��"
 
-#: ../plugins/document-manager/plugin.c:187
+#: ../plugins/document-manager/plugin.c:190
 msgid "Make the selected text lowercase"
 msgstr "��ล���อ�วาม�ี��ลือ��ห������ัว�ิม���ล��"
 
-#: ../plugins/document-manager/plugin.c:189
+#: ../plugins/document-manager/plugin.c:192
 msgid "Convert EOL to CRLF"
 msgstr "��ล� EOL ���� CRLF"
 
-#: ../plugins/document-manager/plugin.c:190
+#: ../plugins/document-manager/plugin.c:193
 msgid "Convert End Of Line characters to DOS EOL (CRLF)"
 msgstr "��ล�อั��ระ�ิ��รร�ั����� EOL �อ� DOS (CRLF)"
 
-#: ../plugins/document-manager/plugin.c:192
+#: ../plugins/document-manager/plugin.c:195
 msgid "Convert EOL to LF"
 msgstr "��ล� EOL ���� LF"
 
-#: ../plugins/document-manager/plugin.c:193
+#: ../plugins/document-manager/plugin.c:196
 msgid "Convert End Of Line characters to Unix EOL (LF)"
 msgstr "��ล�อั��ระ�ิ��รร�ั����� EOL �อ�ยู�ิ��� (LF)"
 
-#: ../plugins/document-manager/plugin.c:195
+#: ../plugins/document-manager/plugin.c:198
 msgid "Convert EOL to CR"
 msgstr "��ล� EOL ���� CR"
 
-#: ../plugins/document-manager/plugin.c:196
+#: ../plugins/document-manager/plugin.c:199
 msgid "Convert End Of Line characters to Mac OS EOL (CR)"
 msgstr "��ล�อั��ระ�ิ��รร�ั����� EOL �อ� MacOS (CR)"
 
-#: ../plugins/document-manager/plugin.c:198
+#: ../plugins/document-manager/plugin.c:201
 msgid "Convert EOL to Majority EOL"
 msgstr "��ล� EOL �าม EOL ส�ว��ห��"
 
-#: ../plugins/document-manager/plugin.c:199
-msgid "Convert End Of Line characters to majority of the EOL found in the file"
+#: ../plugins/document-manager/plugin.c:202
+msgid "Convert End Of Line characters to the most common EOL found in the file"
 msgstr "��ล�อั��ระ�ิ��รร�ั����� EOL ส�ว��ห���ี��������ม"
 
-#: ../plugins/document-manager/plugin.c:204
+#: ../plugins/document-manager/plugin.c:207
 msgid "_Select"
 msgstr "�_ลือ�"
 
-#: ../plugins/document-manager/plugin.c:206
+#: ../plugins/document-manager/plugin.c:209
 msgid "Select _All"
 msgstr "�ลือ�_�ั��หม�"
 
-#: ../plugins/document-manager/plugin.c:207
+#: ../plugins/document-manager/plugin.c:210
 msgid "Select all text in the editor"
 msgstr "�ลือ���อ�วาม�ั��หม�����รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:209
+#: ../plugins/document-manager/plugin.c:212
 msgid "Select _Code Block"
 msgstr "�ลือ�_�ล�อ�����"
 
-#: ../plugins/document-manager/plugin.c:210
+#: ../plugins/document-manager/plugin.c:213
 msgid "Select the current code block"
 msgstr "�ลือ��ล�อ������ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:215
+#: ../plugins/document-manager/plugin.c:218
 msgid "Co_mment"
 msgstr "_หมาย�ห�ุ"
 
 #. Block comment: Uses line-comment (comment that affects only single line
 #. such as '//' or '#') and comments a block of lines.
-#: ../plugins/document-manager/plugin.c:218
+#: ../plugins/document-manager/plugin.c:221
 msgid "_Block Comment/Uncomment"
 msgstr "�ำ/�ลิ��ำ หมาย�ห�ุ���_�ล�อ�"
 
-#: ../plugins/document-manager/plugin.c:219
+#: ../plugins/document-manager/plugin.c:222
 msgid "Block comment the selected text"
 msgstr "�ำ��อ�วาม�ี��ลือ��ห�����หมาย�ห�ุ����ล�อ�"
 
 #. Box comment: Uses stream-comment to comment a block of lines, usually with
 #. some decorations, to give an appearance of box.
-#: ../plugins/document-manager/plugin.c:223
+#: ../plugins/document-manager/plugin.c:226
 msgid "Bo_x Comment/Uncomment"
 msgstr "�ำ/�ลิ��ำ หมาย�ห�ุ���_�ล�อ�"
 
-#: ../plugins/document-manager/plugin.c:224
+#: ../plugins/document-manager/plugin.c:227
 msgid "Box comment the selected text"
 msgstr "�ำ��อ�วาม�ี��ลือ��ห�����หมาย�ห�ุ����ล�อ�"
 
@@ -2834,430 +2895,438 @@ msgstr "�ำ��อ�วาม�ี��ลือ��ห�����
 #. characters -- has start and end comment code) and comments any code from
 #. arbitrary start position to arbitrary end position (can be in middle of
 #. lines).
-#: ../plugins/document-manager/plugin.c:230
+#: ../plugins/document-manager/plugin.c:233
 msgid "_Stream Comment/Uncomment"
 msgstr "�ำ/�ลิ��ำ หมาย�ห�ุ��_�ระ�ส�วาม"
 
-#: ../plugins/document-manager/plugin.c:231
+#: ../plugins/document-manager/plugin.c:234
 msgid "Stream comment the selected text"
 msgstr "�ำ��อ�วาม�ี��ลือ��ห�����หมาย�ห�ุ���ระ�ส�วาม"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:237
-msgid "_Line Number..."
-msgstr "�_ล��รร�ั�..."
+#: ../plugins/document-manager/plugin.c:240
+msgid "_Line Numberâ?¦"
+msgstr "�_ล��รร�ั��"
 
-#: ../plugins/document-manager/plugin.c:238
+#: ../plugins/document-manager/plugin.c:241
 msgid "Go to a particular line in the editor"
 msgstr "��ยั��รร�ั��ี���าะ������รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:240
+#: ../plugins/document-manager/plugin.c:243
 msgid "Matching _Brace"
 msgstr "_ว��ล���ี����า�ู�"
 
-#: ../plugins/document-manager/plugin.c:241
+#: ../plugins/document-manager/plugin.c:244
 msgid "Go to the matching brace in the editor"
 msgstr "��ยั�ว��ล���ี����า�ู��ั�����รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:243
+#: ../plugins/document-manager/plugin.c:246
 msgid "_Start of Block"
 msgstr "_����ล�อ�"
 
-#: ../plugins/document-manager/plugin.c:244
+#: ../plugins/document-manager/plugin.c:247
 msgid "Go to the start of the current block"
 msgstr "��ยั�����ล�อ��ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:246
+#: ../plugins/document-manager/plugin.c:249
 msgid "_End of Block"
 msgstr "_��าย�ล�อ�"
 
-#: ../plugins/document-manager/plugin.c:247
+#: ../plugins/document-manager/plugin.c:250
 msgid "Go to the end of the current block"
 msgstr "��ยั���าย�ล�อ��ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:249
+#: ../plugins/document-manager/plugin.c:252
 msgid "Previous _History"
 msgstr "�ระวั�ิ_��อ�ห��า"
 
-#: ../plugins/document-manager/plugin.c:250
-msgid "Goto previous history"
+#: ../plugins/document-manager/plugin.c:253
+msgid "Go to previous history"
 msgstr "��ยั��ระวั�ิ��อ�ห��า"
 
-#: ../plugins/document-manager/plugin.c:252
+#: ../plugins/document-manager/plugin.c:255
 msgid "Next Histor_y"
 msgstr "�ระวั�ิ_�ั���"
 
-#: ../plugins/document-manager/plugin.c:253
-msgid "Goto next history"
+#: ../plugins/document-manager/plugin.c:256
+msgid "Go to next history"
 msgstr "��ยั��ระวั�ิ�ั���"
 
-#: ../plugins/document-manager/plugin.c:258 ../plugins/search/plugin.c:67
+#: ../plugins/document-manager/plugin.c:261 ../plugins/search/plugin.c:67
 msgid "_Search"
 msgstr "_���หา"
 
-#: ../plugins/document-manager/plugin.c:259
+#: ../plugins/document-manager/plugin.c:262
 msgid "_Quick Search"
 msgstr "���หาอย�า��_ร�ว"
 
-#: ../plugins/document-manager/plugin.c:260
+#: ../plugins/document-manager/plugin.c:263
 msgid "Quick editor embedded search"
 msgstr "�าร���หาอย�า��ร�ว����ั�����รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:262
+#: ../plugins/document-manager/plugin.c:265
 msgid "Quick _ReSearch"
 msgstr "_���หา��ำอย�า��ร�ว"
 
-#: ../plugins/document-manager/plugin.c:263
+#: ../plugins/document-manager/plugin.c:266
 msgid "Repeat quick search"
 msgstr "�ำ��ำ�าร���หาอย�า��ร�ว"
 
-#: ../plugins/document-manager/plugin.c:268 ../plugins/gtodo/interface.c:168
+#: ../plugins/document-manager/plugin.c:271 ../plugins/gtodo/interface.c:168
 #: ../src/anjuta-actions.h:30
-#: ../plugins/language-support-cpp-java/plugin.c:1915
+#: ../plugins/language-support-cpp-java/plugin.c:1878
 msgid "_Edit"
 msgstr "�_����"
 
 #. menu title
-#: ../plugins/document-manager/plugin.c:269
+#: ../plugins/document-manager/plugin.c:272
 msgid "_Editor"
 msgstr "��รื�อ�มือ�_����"
 
-#: ../plugins/document-manager/plugin.c:276
+#: ../plugins/document-manager/plugin.c:279
 msgid "_Add Editor View"
 msgstr "�_�ิ�มมุมมอ��อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:277
+#: ../plugins/document-manager/plugin.c:280
 msgid "Add one more view of current document"
 msgstr "��ิ�มมุมมอ��อ��อ�สาร�ั��ุ�ั�อี�ห�ึ��มุมมอ�"
 
-#: ../plugins/document-manager/plugin.c:279
+#: ../plugins/document-manager/plugin.c:282
 msgid "_Remove Editor View"
 msgstr "_ล�มุมมอ��อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:280
+#: ../plugins/document-manager/plugin.c:283
 msgid "Remove current view of the document"
 msgstr "ล�มุมมอ��ั��ุ�ั��อ��อ�สาร"
 
-#: ../plugins/document-manager/plugin.c:282
+#: ../plugins/document-manager/plugin.c:285
 msgid "U_ndo"
 msgstr "�รี_ย��ื�"
 
-#: ../plugins/document-manager/plugin.c:283 ../plugins/glade/plugin.c:4089
+#: ../plugins/document-manager/plugin.c:286 ../plugins/glade/plugin.c:4090
 msgid "Undo the last action"
 msgstr "�รีย��ื���ิ�ั�ิ�ารล�าสุ�"
 
-#: ../plugins/document-manager/plugin.c:285
+#: ../plugins/document-manager/plugin.c:288
 msgid "_Redo"
 msgstr "_�ำ��ำ"
 
-#: ../plugins/document-manager/plugin.c:286
+#: ../plugins/document-manager/plugin.c:289
 msgid "Redo the last undone action"
 msgstr "�ำ��ำ��ิ�ั�ิ�าร�ี��รีย��ื�ล�าสุ�"
 
-#: ../plugins/document-manager/plugin.c:288
+#: ../plugins/document-manager/plugin.c:291
 msgid "C_ut"
 msgstr "_�ั�"
 
-#: ../plugins/document-manager/plugin.c:289
+#: ../plugins/document-manager/plugin.c:292
 msgid "Cut the selected text from the editor to the clipboard"
 msgstr "�ั���อ�วาม�ี��ลือ��า���รื�อ�มือ�������ยั��ลิ��อร��"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/document-manager/plugin.c:291 ../plugins/terminal/terminal.c:554
+#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:609
 msgid "_Copy"
 msgstr "_�ั�ลอ�"
 
-#: ../plugins/document-manager/plugin.c:292
+#: ../plugins/document-manager/plugin.c:295
 msgid "Copy the selected text to the clipboard"
 msgstr "�ั�ลอ���อ�วาม�ี��ลือ���ยั��ลิ��อร��"
 
-#: ../plugins/document-manager/plugin.c:294 ../plugins/terminal/terminal.c:562
+#: ../plugins/document-manager/plugin.c:297 ../plugins/terminal/terminal.c:617
 msgid "_Paste"
 msgstr "_��ะ"
 
-#: ../plugins/document-manager/plugin.c:295
+#: ../plugins/document-manager/plugin.c:298
 msgid "Paste the content of clipboard at the current position"
 msgstr "��ะ��ื�อหา�อ��ลิ��อร�� � �ำ�ห����ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:303
+#: ../plugins/document-manager/plugin.c:306
 msgid "_Clear"
 msgstr "_ล�า�"
 
-#: ../plugins/document-manager/plugin.c:304
+#: ../plugins/document-manager/plugin.c:307
 msgid "Delete the selected text from the editor"
 msgstr "ล���อ�วาม�ี��ลือ�ออ��า���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:309
+#: ../plugins/document-manager/plugin.c:310
+msgid "_Auto-Complete"
+msgstr "�_�ิม���ม�ำอั���มั�ิ"
+
+#: ../plugins/document-manager/plugin.c:311
+msgid "Auto-complete the current word"
+msgstr "��ิม���ม�ำ�ั��ุ�ั���ยอั���มั�ิ"
+
+#: ../plugins/document-manager/plugin.c:316
 msgid "_Line Number Margin"
 msgstr "�อ��ส���ล�_�รร�ั�"
 
-#: ../plugins/document-manager/plugin.c:310
+#: ../plugins/document-manager/plugin.c:317
 msgid "Show/Hide line numbers"
 msgstr "�ส��/��อ� �ล��รร�ั�"
 
-#: ../plugins/document-manager/plugin.c:312
+#: ../plugins/document-manager/plugin.c:319
 msgid "_Marker Margin"
 msgstr "�อ��_�รื�อ�หมาย"
 
-#: ../plugins/document-manager/plugin.c:313
+#: ../plugins/document-manager/plugin.c:320
 msgid "Show/Hide marker margin"
 msgstr "�ส��/��อ� �อ�สำหรั��ำ��รื�อ�หมาย"
 
-#: ../plugins/document-manager/plugin.c:315
+#: ../plugins/document-manager/plugin.c:322
 msgid "_Code Fold Margin"
 msgstr "_�อ��ั�����"
 
-#: ../plugins/document-manager/plugin.c:316
+#: ../plugins/document-manager/plugin.c:323
 msgid "Show/Hide code fold margin"
 msgstr "�ส��/��อ� �อ�สำหรั��ั�����"
 
-#: ../plugins/document-manager/plugin.c:318
+#: ../plugins/document-manager/plugin.c:325
 msgid "_Indentation Guides"
 msgstr "�_�ว�ารร��ย�อห��า"
 
-#: ../plugins/document-manager/plugin.c:319
+#: ../plugins/document-manager/plugin.c:326
 msgid "Show/Hide indentation guides"
 msgstr "�ส��/��อ� �ส����ว�ารร��ย�อห��า"
 
-#: ../plugins/document-manager/plugin.c:321
+#: ../plugins/document-manager/plugin.c:328
 msgid "_White Space"
 msgstr "_��อ�ว�า�"
 
-#: ../plugins/document-manager/plugin.c:322
+#: ../plugins/document-manager/plugin.c:329
 msgid "Show/Hide white spaces"
 msgstr "�ส��/��อ� ��อ�ว�า�"
 
-#: ../plugins/document-manager/plugin.c:324
+#: ../plugins/document-manager/plugin.c:331
 msgid "_Line End Characters"
 msgstr "_อั��ระ�ิ��รร�ั�"
 
-#: ../plugins/document-manager/plugin.c:325
+#: ../plugins/document-manager/plugin.c:332
 msgid "Show/Hide line end characters"
 msgstr "�ส��/��อ� อั��ระ�ิ��รร�ั�"
 
-#: ../plugins/document-manager/plugin.c:327
+#: ../plugins/document-manager/plugin.c:334
 msgid "Line _Wrapping"
 msgstr "�าร_�ั��รร�ั�"
 
-#: ../plugins/document-manager/plugin.c:328
+#: ../plugins/document-manager/plugin.c:335
 msgid "Enable/disable line wrapping"
 msgstr "��ิ�/�ิ��าร�ั��รร�ั�"
 
-#: ../plugins/document-manager/plugin.c:333
+#: ../plugins/document-manager/plugin.c:340
 msgid "Zoom In"
 msgstr "�ส���ยาย"
 
-#: ../plugins/document-manager/plugin.c:334
+#: ../plugins/document-manager/plugin.c:341
 msgid "Zoom in: Increase font size"
 msgstr "�ส���ยาย: ��ิ�ม��า��ัวอั�ษร"
 
-#: ../plugins/document-manager/plugin.c:336
+#: ../plugins/document-manager/plugin.c:343
 msgid "Zoom Out"
 msgstr "�ส��ย�อ"
 
-#: ../plugins/document-manager/plugin.c:337
+#: ../plugins/document-manager/plugin.c:344
 msgid "Zoom out: Decrease font size"
 msgstr "�ส��ย�อ: ล���า��ัวอั�ษร"
 
-#: ../plugins/document-manager/plugin.c:342
+#: ../plugins/document-manager/plugin.c:349
 msgid "_Highlight Mode"
 msgstr "�หม��_���"
 
-#: ../plugins/document-manager/plugin.c:346
+#: ../plugins/document-manager/plugin.c:353
 msgid "_Close All Folds"
 msgstr "�ิ_��ุ��ั�"
 
-#: ../plugins/document-manager/plugin.c:347
+#: ../plugins/document-manager/plugin.c:354
 msgid "Close all code folds in the editor"
 msgstr "�ิ������ี��ั��ั��หม�����รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:349
+#: ../plugins/document-manager/plugin.c:356
 msgid "_Open All Folds"
 msgstr "_��ิ��ุ��ั�"
 
-#: ../plugins/document-manager/plugin.c:350
+#: ../plugins/document-manager/plugin.c:357
 msgid "Open all code folds in the editor"
 msgstr "��ิ������ี��ั��ั��หม�����รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:352
+#: ../plugins/document-manager/plugin.c:359
 msgid "_Toggle Current Fold"
 msgstr "_สลั��ั��ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:353
+#: ../plugins/document-manager/plugin.c:360
 msgid "Toggle current code fold in the editor"
 msgstr "สลั��าร�ิ�/��ิ������ี��ั��ั��ุ�ั�����รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:358
+#: ../plugins/document-manager/plugin.c:365
 msgid "_Documents"
 msgstr "�_อ�สาร"
 
-#: ../plugins/document-manager/plugin.c:359
+#: ../plugins/document-manager/plugin.c:366
 msgid "Previous Document"
 msgstr "�อ�สาร��อ�ห��า"
 
-#: ../plugins/document-manager/plugin.c:360
+#: ../plugins/document-manager/plugin.c:367
 msgid "Switch to previous document"
 msgstr "ย�าย���อ�สาร��อ�ห��า"
 
-#: ../plugins/document-manager/plugin.c:362
+#: ../plugins/document-manager/plugin.c:369
 msgid "Next Document"
 msgstr "�อ�สาร�ั���"
 
-#: ../plugins/document-manager/plugin.c:363
+#: ../plugins/document-manager/plugin.c:370
 msgid "Switch to next document"
 msgstr "ย�าย���อ�สาร�ั���"
 
-#: ../plugins/document-manager/plugin.c:368
+#: ../plugins/document-manager/plugin.c:375
 msgid "Bookmar_k"
 msgstr "_�ี��ั��ห��า"
 
-#: ../plugins/document-manager/plugin.c:369
+#: ../plugins/document-manager/plugin.c:376
 msgid "_Add Bookmark"
 msgstr "�_�ิ�ม�ี��ั��ห��า"
 
-#: ../plugins/document-manager/plugin.c:370
+#: ../plugins/document-manager/plugin.c:377
 msgid "Add a bookmark at the current line position"
 msgstr "��ิ�ม�ี��ั��ห��า�ี��ำ�ห����รร�ั��ั��ุ�ั�"
 
-#: ../plugins/document-manager/plugin.c:372
+#: ../plugins/document-manager/plugin.c:379
 msgid "_Previous Bookmark"
 msgstr "�ี��ั��ห��า_��อ�ห��า"
 
-#: ../plugins/document-manager/plugin.c:373
+#: ../plugins/document-manager/plugin.c:380
 msgid "Jump to the previous bookmark in the file"
 msgstr "�ระ������ี��ั��ห��า��อ�ห��า�����ม"
 
-#: ../plugins/document-manager/plugin.c:375
+#: ../plugins/document-manager/plugin.c:382
 msgid "_Next Bookmark"
 msgstr "�ี��ั��ห��า_�ั���"
 
-#: ../plugins/document-manager/plugin.c:376
+#: ../plugins/document-manager/plugin.c:383
 msgid "Jump to the next bookmark in the file"
 msgstr "�ระ������ี��ั��ห��า�ั��������ม"
 
-#: ../plugins/document-manager/plugin.c:378
+#: ../plugins/document-manager/plugin.c:385
 msgid "_Clear All Bookmarks"
 msgstr "_ล��ี��ั��ห��า�ั��หม�"
 
-#: ../plugins/document-manager/plugin.c:379
+#: ../plugins/document-manager/plugin.c:386
 msgid "Clear bookmarks"
 msgstr "ล��ี��ั��ห��า�ั��หม�"
 
-#: ../plugins/document-manager/plugin.c:398
+#: ../plugins/document-manager/plugin.c:405
 msgid "Editor file operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั����ม�อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:399
+#: ../plugins/document-manager/plugin.c:406
 msgid "Editor print operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��าร�ิม���อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:400
+#: ../plugins/document-manager/plugin.c:407
 msgid "Editor text transformation"
 msgstr "�าร��ล���อ�วาม�อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:401
+#: ../plugins/document-manager/plugin.c:408
 msgid "Editor text selection"
 msgstr "�าร�ลือ���อ�วาม�อ���รื�อ�มือ�����"
 
 #. { actions_insert, G_N_ELEMENTS (actions_insert), "ActionGroupEditorInsert", N_("Editor text insertions") },
-#: ../plugins/document-manager/plugin.c:403
+#: ../plugins/document-manager/plugin.c:410
 msgid "Editor code commenting"
 msgstr "�าร�ส���ำอ�ิ�าย�����อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:404
+#: ../plugins/document-manager/plugin.c:411
 msgid "Editor navigations"
 msgstr "�าร��อ��ู�อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:405
+#: ../plugins/document-manager/plugin.c:412
 msgid "Editor edit operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��าร������อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:406
+#: ../plugins/document-manager/plugin.c:413
 msgid "Editor zoom operations"
 msgstr "�าร�ำ�า��ส��ย�อ-�ยาย�อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:407
+#: ../plugins/document-manager/plugin.c:414
 msgid "Editor syntax highlighting styles"
 msgstr "รู�����าร�����วยา�ร���อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:408
+#: ../plugins/document-manager/plugin.c:415
 msgid "Editor text formating"
 msgstr "�าร�ั�รู������อ�วาม�อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:409
+#: ../plugins/document-manager/plugin.c:416
 msgid "Simple searching"
 msgstr "�าร���หา�����าย"
 
-#: ../plugins/document-manager/plugin.c:410
-#: ../plugins/document-manager/plugin.c:1713
-#: ../plugins/document-manager/plugin.c:2130
-#: ../plugins/document-manager/plugin.c:2140
+#: ../plugins/document-manager/plugin.c:417
+#: ../plugins/document-manager/plugin.c:1732
+#: ../plugins/document-manager/plugin.c:2149
+#: ../plugins/document-manager/plugin.c:2159
 msgid "Documents"
 msgstr "�อ�สาร"
 
-#: ../plugins/document-manager/plugin.c:415
+#: ../plugins/document-manager/plugin.c:422
 msgid "Editor view settings"
 msgstr "��า�ั��มุมมอ��อ���รื�อ�มือ�����"
 
-#: ../plugins/document-manager/plugin.c:600
+#: ../plugins/document-manager/plugin.c:607
 msgid "Reload"
 msgstr "�รีย��หม�"
 
-#: ../plugins/document-manager/plugin.c:606
-msgid "Goto"
+#: ../plugins/document-manager/plugin.c:613
+msgid "Go to"
 msgstr "��ยั�"
 
-#: ../plugins/document-manager/plugin.c:909
+#: ../plugins/document-manager/plugin.c:929
 msgid "OVR"
 msgstr "�ั�"
 
-#: ../plugins/document-manager/plugin.c:913
+#: ../plugins/document-manager/plugin.c:933
 msgid "INS"
 msgstr "��ร�"
 
-#: ../plugins/document-manager/plugin.c:917
-#: ../plugins/document-manager/plugin.c:919
+#: ../plugins/document-manager/plugin.c:937
+#: ../plugins/document-manager/plugin.c:939
 msgid "Zoom"
 msgstr "�ส��ย�อ-�ยาย"
 
-#: ../plugins/document-manager/plugin.c:922
+#: ../plugins/document-manager/plugin.c:942
 msgid "Col"
 msgstr "�อลัม��"
 
-#: ../plugins/document-manager/plugin.c:923
+#: ../plugins/document-manager/plugin.c:943
 msgid "Mode"
 msgstr "�หม�"
 
 #. Automatic highlight menu
-#: ../plugins/document-manager/plugin.c:1003
+#: ../plugins/document-manager/plugin.c:1023
 msgid "Automatic"
 msgstr "อั���มั�ิ"
 
 #. this may fail, too
-#: ../plugins/document-manager/plugin.c:1537
+#: ../plugins/document-manager/plugin.c:1556
 #, c-format
 msgid "Autosave failed for %s"
 msgstr "�ั��ึ� %s ��ยอั���มั�ิ�ม�สำ�ร��"
 
-#: ../plugins/document-manager/plugin.c:1551
+#: ../plugins/document-manager/plugin.c:1570
 msgid "Autosave completed"
 msgstr "�ั��ึ�อั���มั�ิ�รีย�ร�อย"
 
 #: ../plugins/document-manager/search-box.c:383
 #, c-format
-msgid "Search for \"%s\" reached end and was continued on top."
+msgid "Search for \"%s\" reached the end and was continued at the top."
 msgstr "�าร���หา \"%s\" ����าย���ม �ละ�ริ�มหา��อ�า�������ม"
 
 #: ../plugins/document-manager/search-box.c:389
 #, c-format
 msgid ""
-"Search for \"%s\" reached end and was continued on top but no new match was "
-"found."
+"Search for \"%s\" reached the end and was continued at the top but no new "
+"match was found."
 msgstr "�าร���หา \"%s\" ����าย���ม �ละ�ริ�มหา��อ�า�������ม ����ม�����อ�วาม�ี��ร�"
 
 #: ../plugins/document-manager/search-box.c:446
-#: ../plugins/search/anjuta-search.ui.h:22
+#: ../plugins/search/anjuta-search.ui.h:18
 msgid "Match case"
 msgstr "�ัว�ิม���ห��-�ล���ร��ั�"
 
@@ -3278,8 +3347,8 @@ msgstr "�ม���ราย�าร"
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:670
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:726
 #, c-format
-msgid "No recently used resource found with URI `%s'"
-msgstr "�ม����าร����รั�ยา�รล�าสุ��ั� URI `%s'"
+msgid "No recently used resource found with URI \"%s\""
+msgstr "�ม����าร����รั�ยา�รล�าสุ��ั� URI  \"%s\""
 
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:750
 #: ../plugins/file-loader/anjuta-recent-chooser-menu.c:758
@@ -3300,28 +3369,26 @@ msgstr "ราย�าร�ม��รา��ื�อ"
 #. * in a recent files menu. The %d is the number of the item,
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:980
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:978
 #, c-format
-msgid "recent menu label|_%d. %s"
+msgctxt "recent menu label"
+msgid "_%d. %s"
 msgstr "_%d. %s"
 
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
-#. *
-#. * Don't include the prefix "recent menu label|" in the translation.
 #.
-#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:987
+#: ../plugins/file-loader/anjuta-recent-chooser-menu.c:983
 #, c-format
-msgid "recent menu label|%d. %s"
+msgctxt "recent menu label"
+msgid "%d. %s"
 msgstr "%d. %s"
 
 #: ../plugins/file-loader/plugin.c:116
 #, c-format
 msgid ""
-"Can not open \"%s\".\n"
+"Cannot open \"%s\".\n"
 "\n"
 "%s"
 msgstr ""
@@ -3337,7 +3404,7 @@ msgid ""
 "There is no plugin, default action, or application configured to handle this "
 "file type.\n"
 "\n"
-"Mime type: %s\n"
+"MIME type: %s\n"
 "\n"
 "You may choose to try opening it with the following plugins or applications."
 msgstr ""
@@ -3397,11 +3464,11 @@ msgid "Python source files"
 msgstr "���ม�อร�ส Python"
 
 #: ../plugins/file-loader/plugin.c:555
-msgid "Hyper text markup files"
+msgid "Hypertext markup files"
 msgstr "���ม HTML"
 
 #: ../plugins/file-loader/plugin.c:564
-msgid "Shell scripts files"
+msgid "Shell script files"
 msgstr "���มส�ริ�����ลล�"
 
 #: ../plugins/file-loader/plugin.c:569
@@ -3430,8 +3497,8 @@ msgid "New empty file"
 msgstr "สร�า����ม��ล�า���ม�หม�"
 
 #: ../plugins/file-loader/plugin.c:892
-msgid "_Open..."
-msgstr "_��ิ�..."
+msgid "_Openâ?¦"
+msgstr "_��ิ��"
 
 #: ../plugins/file-loader/plugin.c:903 ../plugins/file-loader/plugin.c:916
 msgid "_Open"
@@ -3445,51 +3512,51 @@ msgstr "��ิ�_��วย"
 msgid "Open with"
 msgstr "��ิ���วย"
 
-#: ../plugins/file-loader/plugin.c:1245 ../plugins/file-loader/plugin.c:1251
+#: ../plugins/file-loader/plugin.c:1243 ../plugins/file-loader/plugin.c:1249
 #: ../plugins/file-loader/anjuta-loader.plugin.in.h:1
 msgid "File Loader"
 msgstr "��รื�อ�มือ�หล����ม"
 
-#: ../plugins/file-loader/plugin.c:1255
+#: ../plugins/file-loader/plugin.c:1253
 msgid "New"
 msgstr "�หม�"
 
-#: ../plugins/file-loader/plugin.c:1256
+#: ../plugins/file-loader/plugin.c:1254
 msgid "New file, project and project components."
 msgstr "สร�า����ม ��ร��าร �ละส�ว��ระ�อ���ร��าร�ิ���หม�"
 
-#: ../plugins/file-loader/plugin.c:1263 ../plugins/file-loader/plugin.c:1303
+#: ../plugins/file-loader/plugin.c:1261 ../plugins/file-loader/plugin.c:1301
 msgid "Open"
 msgstr "��ิ�"
 
-#: ../plugins/file-loader/plugin.c:1267
+#: ../plugins/file-loader/plugin.c:1265
 msgid "Open _Recent"
 msgstr "��ิ�_ล�าสุ�"
 
-#: ../plugins/file-loader/plugin.c:1268 ../plugins/file-loader/plugin.c:1305
+#: ../plugins/file-loader/plugin.c:1266 ../plugins/file-loader/plugin.c:1303
 msgid "Open recent file"
 msgstr "��ิ����มล�าสุ�"
 
-#: ../plugins/file-loader/plugin.c:1274
+#: ../plugins/file-loader/plugin.c:1272
 msgid "Open recent files"
 msgstr "��ิ����มล�าสุ�"
 
-#: ../plugins/file-loader/plugin.c:1304
+#: ../plugins/file-loader/plugin.c:1302
 msgid "Open a file"
 msgstr "��ิ����ม"
 
-#: ../plugins/file-loader/plugin.c:1420 ../plugins/file-loader/plugin.c:1422
+#: ../plugins/file-loader/plugin.c:1416 ../plugins/file-loader/plugin.c:1418
 #, c-format
 msgid "File not found"
 msgstr "�ม������ม"
 
 #. %s is name of file that will be opened
-#: ../plugins/file-loader/plugin.c:1441
+#: ../plugins/file-loader/plugin.c:1437
 #, c-format
 msgid "Please select a plugin to open <b>%s</b>."
-msgstr "�รุ�า�ลือ��ลั���ี��ะ�����ิ� <b>%s</b>"
+msgstr "�รุ�า�ลือ��ลั��อิ��ี��ะ�����ิ� <b>%s</b>"
 
-#: ../plugins/file-loader/plugin.c:1445
+#: ../plugins/file-loader/plugin.c:1441 ../plugins/project-import/plugin.c:205
 msgid "Open With"
 msgstr "��ิ���วย"
 
@@ -3518,7 +3585,8 @@ msgid "Filter"
 msgstr "�ัว�รอ�"
 
 #: ../plugins/file-manager/file-manager.ui.h:7
-#: ../plugins/symbol-db/plugin.c:2334 ../plugins/symbol-db/plugin.c:2423
+#: ../plugins/symbol-db/plugin.c:2360 ../plugins/symbol-db/plugin.c:2448
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
 msgid "Global"
 msgstr "ส�ว��ลา�"
 
@@ -3526,25 +3594,20 @@ msgstr "ส�ว��ลา�"
 msgid "Root directory if no project is open:"
 msgstr "���ร��อรีรา���า�ม�มี��ร��าร��ิ�อยู�:"
 
-#: ../plugins/file-manager/file-model.c:119
-#: ../plugins/symbol-db/symbol-db-view.c:799
+#: ../plugins/file-manager/file-model.c:120
 msgid "Loading..."
 msgstr "�ำลั��หล�..."
 
-#: ../plugins/file-manager/file-view.c:73
-msgid "Up-to-date"
-msgstr "������อมูลล�าสุ�"
-
-#: ../plugins/file-manager/file-view.c:510
+#: ../plugins/file-manager/file-view.c:530
 msgid "Filename"
 msgstr "�ื�อ���ม"
 
-#: ../plugins/file-manager/file-view.c:590
-msgid "Base uri"
+#: ../plugins/file-manager/file-view.c:610
+msgid "Base URI"
 msgstr "URI �ั�����"
 
-#: ../plugins/file-manager/file-view.c:591
-msgid "Uri of the top-most path displayed"
+#: ../plugins/file-manager/file-view.c:611
+msgid "URI of the top-most path displayed"
 msgstr "URI �อ��า�ระ�ั���สุ��ี��ส��"
 
 #: ../plugins/file-manager/plugin.c:74
@@ -3555,40 +3618,36 @@ msgstr "�_�ลี�ย��ื�อ"
 msgid "Rename file or directory"
 msgstr "��ลี�ย��ื�อ���ม/���ร��อรี"
 
-#: ../plugins/file-manager/plugin.c:294
+#: ../plugins/file-manager/plugin.c:298
 msgid "File manager popup actions"
 msgstr "�าร�ระ�ำ���ม�ู�ุ��ึ���อ���รื�อ�มือ�ั��าร���ม"
 
-#: ../plugins/file-manager/plugin.c:327
+#: ../plugins/file-manager/plugin.c:331
 msgid "Files"
 msgstr "���ม"
 
-#: ../plugins/file-manager/plugin.c:456 ../plugins/file-manager/plugin.c:465
+#: ../plugins/file-manager/plugin.c:460 ../plugins/file-manager/plugin.c:469
 #: ../plugins/file-manager/file-manager.plugin.in.h:1
 msgid "File Manager"
 msgstr "��รื�อ�มือ�ั��าร���ม"
 
 #: ../plugins/file-wizard/anjuta-file-wizard.ui.h:1
-msgid "<b>File Information</b>"
-msgstr "<b>��อมูล���ม</b>"
-
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add License Information"
 msgstr "��ิ�ม��อมูลสั��าอ�ุ�า�"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:2
 msgid "Add to project"
 msgstr "��ิ�ม���า����ร��าร"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:3
 msgid "Add to repository"
 msgstr "��ิ�ม���า���ลั�"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:6
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:4
 msgid "Create corresponding header file"
 msgstr "สร�า����มส�ว�หัว�ี��ร��ั�"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:5
 msgid ""
 "Enter the File name.\n"
 "The extension will be added according to the type."
@@ -3596,20 +3655,24 @@ msgstr ""
 "��อ��ื�อ���ม\n"
 "�ามส�ุล�ะ�ู���ิม�าม��ิ��อ����ม"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
-#: ../plugins/git/anjuta-git.ui.h:69 ../plugins/macro/anjuta-macro.ui.h:6
-#: ../plugins/tools/anjuta-tools.ui.h:7
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:7
+msgid "File Information"
+msgstr "��อมูล���ม"
+
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:9
+#: ../plugins/git/anjuta-git.ui.h:64 ../plugins/macro/anjuta-macro.ui.h:6
+#: ../plugins/tools/anjuta-tools.ui.h:6
 msgid "Name:"
 msgstr "�ื�อ:"
 
-#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:11
-#: ../plugins/starter/starter.c:404
+#: ../plugins/file-wizard/anjuta-file-wizard.ui.h:10
+#: ../plugins/starter/starter.c:409
 msgid "New File"
 msgstr "���ม�หม�"
 
 #: ../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
+#: ../plugins/gbf-am/gbf-am-properties.c:1527
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:353
 msgid "Type:"
 msgstr "��ิ�:"
 
@@ -3617,47 +3680,47 @@ msgstr "��ิ�:"
 msgid "Use Template for the Header file"
 msgstr "����ม����สำหรั����มส�ว�หัว"
 
-#: ../plugins/file-wizard/file.c:83
+#: ../plugins/file-wizard/file.c:84
 msgid "C Source File"
 msgstr "���ม�อร�ส C"
 
-#: ../plugins/file-wizard/file.c:84
+#: ../plugins/file-wizard/file.c:85
 msgid "C/C++ Header File"
 msgstr "���มส�ว�หัว C/C++"
 
-#: ../plugins/file-wizard/file.c:85
+#: ../plugins/file-wizard/file.c:86
 msgid "C++ Source File"
 msgstr "���ม�อร�ส C++"
 
-#: ../plugins/file-wizard/file.c:86
+#: ../plugins/file-wizard/file.c:87
 msgid "C# Source File"
 msgstr "���ม�อร�ส C#"
 
-#: ../plugins/file-wizard/file.c:87
+#: ../plugins/file-wizard/file.c:88
 msgid "Java Source File"
 msgstr "���ม�อร�ส Java"
 
-#: ../plugins/file-wizard/file.c:88
+#: ../plugins/file-wizard/file.c:89
 msgid "Perl Source File"
 msgstr "���ม�อร�ส Perl"
 
-#: ../plugins/file-wizard/file.c:89
+#: ../plugins/file-wizard/file.c:90
 msgid "Python Source File"
 msgstr "���ม�อร�ส Python"
 
-#: ../plugins/file-wizard/file.c:90
+#: ../plugins/file-wizard/file.c:91
 msgid "Shell Script File"
 msgstr "���มส�ริ�����ลล�"
 
-#: ../plugins/file-wizard/file.c:91
+#: ../plugins/file-wizard/file.c:92
 msgid "Other"
 msgstr "อื�� �"
 
-#: ../plugins/file-wizard/file.c:104
+#: ../plugins/file-wizard/file.c:105
 msgid "BSD Public License"
 msgstr "สั��าอ�ุ�า�สา�าร�ะ BSD"
 
-#: ../plugins/file-wizard/file.c:182
+#: ../plugins/file-wizard/file.c:183
 msgid "Unable to build user interface for New File"
 msgstr "สร�า�ส�ว��ิ���อ�ู����สำหรั� \"���ม�หม�\" �ม����"
 
@@ -3666,21 +3729,21 @@ msgid "Invalid GbfAmConfigValue type"
 msgstr "��ิ��อ� GbfAmConfigValue �ม��ู���อ�"
 
 #: ../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.ui.h:2
 msgid "Add _Package"
 msgstr "��ิ�ม�_�����"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:3
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:2
 msgid "Add _module"
 msgstr "��ิ�ม_มอ�ูล"
 
-#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:4
 msgid "Packages"
 msgstr "������"
 
+#: ../plugins/gbf-am/gbf-am-dialogs.ui.h:5
+msgid "Select Package to add:"
+msgstr "�ลือ��������ี��ะ��ิ�ม:"
+
 #: ../plugins/gbf-am/gbf-am-dialogs.ui.h:6
 msgid "Select package"
 msgstr "�ลือ�������"
@@ -3689,420 +3752,461 @@ msgstr "�ลือ�������"
 msgid "Variables"
 msgstr "�ัว��ร"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2391
-#: ../plugins/gbf-am/gbf-am-project.c:2469
-#: ../plugins/gbf-am/gbf-am-project.c:2678
-#: ../plugins/gbf-am/gbf-am-project.c:2887
-#: ../plugins/gbf-am/gbf-am-project.c:3037
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2331
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2409
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2637
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2823
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2971
+#: ../plugins/gbf-am/gbf-am-project.c:199
+#: ../plugins/gbf-am/gbf-am-project.c:3352
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3079
+msgid "Static Library"
+msgstr "�ล�รารีส���ิ�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:202
+#: ../plugins/gbf-am/gbf-am-project.c:3354
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3081
+msgid "Shared Library"
+msgstr "�ล�รารี���ร�วม"
+
+#: ../plugins/gbf-am/gbf-am-project.c:205
+#: ../plugins/gbf-am/gbf-am-project.c:3358
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3083
+msgid "Man Documentation"
+msgstr "�อ�สาร��� Man"
+
+#: ../plugins/gbf-am/gbf-am-project.c:208
+#: ../plugins/gbf-am/gbf-am-project.c:3360
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3085
+msgid "Miscellaneous Data"
+msgstr "��อมูล������ล��"
+
+#: ../plugins/gbf-am/gbf-am-project.c:211
+#: ../plugins/gbf-am/gbf-am-project.c:3364
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3089
+msgid "Script"
+msgstr "ส�ริ���"
+
+#: ../plugins/gbf-am/gbf-am-project.c:214
+#: ../plugins/gbf-am/gbf-am-project.c:3366
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3091
+msgid "Info Documentation"
+msgstr "�อ�สาร��� Info"
+
+#: ../plugins/gbf-am/gbf-am-project.c:217
+msgid "Lisp Module"
+msgstr "มอ�ูล Lisp"
+
+#: ../plugins/gbf-am/gbf-am-project.c:220
+#: ../plugins/gbf-am/gbf-am-project.c:3356
+msgid "Header Files"
+msgstr "���มส�ว�หัว"
+
+#: ../plugins/gbf-am/gbf-am-project.c:223
+#: ../plugins/gbf-am/gbf-am-project.c:3368
+msgid "Java Module"
+msgstr "มอ�ูล�าวา"
+
+#: ../plugins/gbf-am/gbf-am-project.c:226
+#: ../plugins/gbf-am/gbf-am-project.c:3370
+msgid "Python Module"
+msgstr "มอ�ูล���อ�"
+
+#: ../plugins/gbf-am/gbf-am-project.c:229
+msgid "Generic rule"
+msgstr "���ั�ว��"
+
+#: ../plugins/gbf-am/gbf-am-project.c:232
+msgid "Extra target"
+msgstr "���าหมาย��ิ�ม��ิม"
+
+#: ../plugins/gbf-am/gbf-am-project.c:235
+msgid "Configure file"
+msgstr "���มส�ริ����ั����า"
+
+#: ../plugins/gbf-am/gbf-am-project.c:238
+msgid "Interface file"
+msgstr "���มส�ว��ิ���อ�ู����"
+
+#: ../plugins/gbf-am/gbf-am-project.c:241
+msgid "GLib mkenums"
+msgstr "mkenums �อ� GLib"
+
+#: ../plugins/gbf-am/gbf-am-project.c:244
+msgid "GLib genmarshal"
+msgstr "genmarshal �อ� GLib"
+
+#: ../plugins/gbf-am/gbf-am-project.c:247
+msgid "Intl rule"
+msgstr "�� Intl"
+
+#: ../plugins/gbf-am/gbf-am-project.c:2559
+#: ../plugins/gbf-am/gbf-am-project.c:2637
+#: ../plugins/gbf-am/gbf-am-project.c:2846
+#: ../plugins/gbf-am/gbf-am-project.c:3055
+#: ../plugins/gbf-am/gbf-am-project.c:3205
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2332
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2410
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2638
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2824
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2972
 msgid "Group doesn't exist"
 msgstr "�ม�มี�ลุ�ม�ี�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2411
-#: ../plugins/gbf-am/gbf-am-project.c:2514
-#: ../plugins/gbf-am/gbf-am-project.c:2930
-#: ../plugins/gbf-am/gbf-am-project.c:3152
-#: ../plugins/gbf-am/gbf-am-project.c:3372
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2351
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2454
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2866
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3046
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3232
+#: ../plugins/gbf-am/gbf-am-project.c:2579
+#: ../plugins/gbf-am/gbf-am-project.c:2682
+#: ../plugins/gbf-am/gbf-am-project.c:3098
+#: ../plugins/gbf-am/gbf-am-project.c:3320
+#: ../plugins/gbf-am/gbf-am-project.c:3541
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2352
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2455
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2867
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3047
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3233
 msgid "Target doesn't exist"
 msgstr "�ม�มี���าหมาย�ี�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2445
-#: ../plugins/gbf-am/gbf-am-project.c:2489
-#: ../plugins/gbf-am/gbf-am-project.c:2532
-#: ../plugins/gbf-am/gbf-am-project.c:2848
-#: ../plugins/gbf-am/gbf-am-project.c:2908
-#: ../plugins/gbf-am/gbf-am-project.c:3112
-#: ../plugins/gbf-am/gbf-am-project.c:3173
-#: ../plugins/gbf-am/gbf-am-project.c:3475
-#: ../plugins/gbf-am/gbf-am-project.c:3536
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2385
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2429
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2472
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2784
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2844
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3007
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3067
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3299
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3360
+#: ../plugins/gbf-am/gbf-am-project.c:2613
+#: ../plugins/gbf-am/gbf-am-project.c:2657
+#: ../plugins/gbf-am/gbf-am-project.c:2700
+#: ../plugins/gbf-am/gbf-am-project.c:3016
+#: ../plugins/gbf-am/gbf-am-project.c:3076
+#: ../plugins/gbf-am/gbf-am-project.c:3280
+#: ../plugins/gbf-am/gbf-am-project.c:3341
+#: ../plugins/gbf-am/gbf-am-project.c:3649
+#: ../plugins/gbf-am/gbf-am-project.c:3710
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2386
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2430
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2473
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2785
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2845
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3008
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3068
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3300
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3361
 msgid "Unable to update project"
 msgstr "�ม�สามาร��รั���อมูล��ร��าร"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2575
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2517
+#: ../plugins/gbf-am/gbf-am-project.c:2743
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2518
 msgid "Invalid or remote path (only local paths supported)"
 msgstr "�า��ม��ู���อ�หรือ�����า�����รือ��าย (รอ�รั��า�����รื�อ����า�ั��)"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2583
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2538
+#: ../plugins/gbf-am/gbf-am-project.c:2751
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2539
+#: ../plugins/dir-project/dir-project.c:728
+#: ../plugins/dir-project/dir-project.c:800
+#, c-format
 msgid "Project doesn't exist or invalid path"
 msgstr "��ร��าร�ม�มีอยู�หรือ�า��ม��ู���อ�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2594
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2552
+#: ../plugins/gbf-am/gbf-am-project.c:2762
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2553
 msgid "Malformed project"
 msgstr "��ร��าร�ิ�รู����"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2791
+#: ../plugins/gbf-am/gbf-am-project.c:2959
 msgid "Please specify group name"
 msgstr "�รุ�าระ�ุ�ื�อ�ลุ�ม"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2805
+#: ../plugins/gbf-am/gbf-am-project.c:2973
 msgid "Group name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr "�ื�อ�ลุ�มสามาร�����ัวอั�ษร, �ัว�ล�, '_', '-' หรือ '.' ������า�ั��"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2814
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2750
+#: ../plugins/gbf-am/gbf-am-project.c:2982
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2751
 msgid "Parent group doesn't exist"
 msgstr "�ลุ�ม�ม��ม�มีอยู�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2825
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2761
+#: ../plugins/gbf-am/gbf-am-project.c:2993
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2762
 msgid "Group already exists"
 msgstr "�ลุ�มมีอยู���อ��ล�ว"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2835
-#: ../plugins/gbf-am/gbf-am-project.c:2862
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2771
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2798
+#: ../plugins/gbf-am/gbf-am-project.c:3003
+#: ../plugins/gbf-am/gbf-am-project.c:3030
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2772
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2799
 msgid "Group couldn't be created"
 msgstr "�ม�สามาร�สร�า��ลุ�ม���"
 
-#: ../plugins/gbf-am/gbf-am-project.c:2895
+#: ../plugins/gbf-am/gbf-am-project.c:3063
 msgid "Group couldn't be removed"
 msgstr "�ม�สามาร�ล��ลุ�ม���"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3045
+#: ../plugins/gbf-am/gbf-am-project.c:3213
 msgid "Please specify target name"
 msgstr "�รุ�าระ�ุ�ื�อ���าหมาย"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3059
+#: ../plugins/gbf-am/gbf-am-project.c:3227
 msgid "Target name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr "�ื�อ���าหมายสามาร�����ัวอั�ษร, �ัว�ล�, '_', '-' หรือ '.' ������า�ั��"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3068
+#: ../plugins/gbf-am/gbf-am-project.c:3236
 msgid "Shared library target name must be of the form 'libxxx.la'"
 msgstr "���าหมาย�ี������ล�รารี���ร�วม�ะ��อ�มี�ื�อ��รู� 'libxxx.la'"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3077
+#: ../plugins/gbf-am/gbf-am-project.c:3245
 msgid "Static library target name must be of the form 'libxxx.a'"
 msgstr "���าหมาย�ี������ล�รารีส���ิ��ะ��อ�มี�ื�อ��รู� 'libxxx.a'"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3089
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2984
+#: ../plugins/gbf-am/gbf-am-project.c:3257
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2985
 msgid "Target already exists"
 msgstr "���าหมายมีอยู���อ��ล�ว"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3099
+#: ../plugins/gbf-am/gbf-am-project.c:3267
 msgid "General failure in target creation"
 msgstr "��ิ��วามล�ม�หลว�ั�ว�����ารสร�า����าหมาย"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3127
+#: ../plugins/gbf-am/gbf-am-project.c:3295
 msgid "Newly created target could not be identified"
 msgstr "���าหมาย�หม��ี�สร�า��หม��ม�สามาร�ระ�ุ�ื�อ���"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3160
+#: ../plugins/gbf-am/gbf-am-project.c:3328
 msgid "Target couldn't be removed"
 msgstr "�ม�สามาร�ล����าหมาย���"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3184
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3078
-msgid "Static Library"
-msgstr "�ล�รารีส���ิ�"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3186
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3080
-msgid "Shared Library"
-msgstr "�ล�รารี���ร�วม"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3188
-msgid "Header Files"
-msgstr "���มส�ว�หัว"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3190
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3082
-msgid "Man Documentation"
-msgstr "�อ�สาร��� Man"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3192
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3084
-msgid "Miscellaneous Data"
-msgstr "��อมูล������ล��"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3196
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3088
-msgid "Script"
-msgstr "ส�ริ���"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3198
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3090
-msgid "Info Documentation"
-msgstr "�อ�สาร��� Info"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3200
-msgid "Java Module"
-msgstr "มอ�ูล�าวา"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3202
-msgid "Python Module"
-msgstr "มอ�ูล���อ�"
-
-#: ../plugins/gbf-am/gbf-am-project.c:3260
-#: ../plugins/gbf-am/gbf-am-project.c:3513
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3142
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3337
+#: ../plugins/gbf-am/gbf-am-project.c:3428
+#: ../plugins/gbf-am/gbf-am-project.c:3687
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3143
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3338
 msgid "Source doesn't exist"
 msgstr "�อร�ส�ม�มีอยู�"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3363
+#: ../plugins/gbf-am/gbf-am-project.c:3532
 msgid ""
 "Source file name can only contain alphanumeric, '_', '-' or '.' characters"
 msgstr "�ื�อ���ม�อร�สสามาร�����ัวอั�ษร, �ัว�ล�, '_', '-' หรือ '.' ������า�ั��"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3440
+#: ../plugins/gbf-am/gbf-am-project.c:3612
 msgid "Source file is already in given target"
 msgstr "���ม�อร�สมีอยู���อ��ล�ว�����าหมาย�ี��ำห��"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3457
+#: ../plugins/gbf-am/gbf-am-project.c:3630
 msgid "General failure in adding source file"
 msgstr "��ิ��วามล�ม�หลว�ั�ว�����าร��ิ�ม���ม�อร�ส"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3490
+#: ../plugins/gbf-am/gbf-am-project.c:3664
 msgid "Newly added source file could not be identified"
 msgstr "���ม�อร�ส�ี���ิ�ม�หม��ม�สามาร�ระ�ุ�ื�อ���"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3521
+#: ../plugins/gbf-am/gbf-am-project.c:3695
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3346
 msgid "Source couldn't be removed"
 msgstr "�ม�สามาร�ล��อร�ส���"
 
-#: ../plugins/gbf-am/gbf-am-project.c:3707
-#: ../plugins/gbf-am/gbf-am-project.c:3708
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3449
+#: ../plugins/gbf-am/gbf-am-project.c:4111
+#: ../plugins/gbf-am/gbf-am-project.c:4112
 #: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3450
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3451
 msgid "Project directory"
 msgstr "���ร��อรี��ร��าร"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:341
-#: ../plugins/gbf-am/gbf-am-properties.c:393
+#: ../plugins/gbf-am/gbf-am-properties.c:344
+#: ../plugins/gbf-am/gbf-am-properties.c:396
 msgid "Enter new module"
 msgstr "��อ�มอ�ูล�หม�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:434
-#: ../plugins/gbf-am/gbf-am-properties.c:930
+#: ../plugins/gbf-am/gbf-am-properties.c:437
+#: ../plugins/gbf-am/gbf-am-properties.c:933
 msgid "Module/Packages"
 msgstr "มอ�ูล/������"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:441
-#: ../plugins/gbf-am/gbf-am-properties.c:939
+#: ../plugins/gbf-am/gbf-am-properties.c:444
+#: ../plugins/gbf-am/gbf-am-properties.c:942
 msgid "Version"
 msgstr "รุ��"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:527
+#: ../plugins/gbf-am/gbf-am-properties.c:530
 #, 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:529
+#: ../plugins/gbf-am/gbf-am-properties.c:532
 #, c-format
 msgid "Are you sure you want to remove package \"%s\"?"
 msgstr "ยื�ยั�ว�า��อ��ารล������� \"%s\" หรือ�ม�?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:587
-#: ../plugins/gbf-am/gbf-am-properties.c:669
+#: ../plugins/gbf-am/gbf-am-properties.c:590
+#: ../plugins/gbf-am/gbf-am-properties.c:672
 msgid "Enter new variable"
 msgstr "��อ��ัว��ร�หม�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:700
+#: ../plugins/gbf-am/gbf-am-properties.c:703
 #, c-format
 msgid "Are you sure you want to remove variable \"%s\"?"
 msgstr "ยื�ยั�ว�า��อ��ารล��ัว��ร  \"%s\" หรือ�ม�?"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:854
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:177
+#: ../plugins/gbf-am/gbf-am-properties.c:857
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:180
 msgid "Project:"
 msgstr "��ร��าร:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:857
+#: ../plugins/gbf-am/gbf-am-properties.c:860
 msgid "Package name:"
 msgstr "�ื�อ������:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:860
-#: ../plugins/project-wizard/templates/translatable-strings.h:102
+#: ../plugins/gbf-am/gbf-am-properties.c:863
+#: ../plugins/project-wizard/templates/translatable-strings.h:110
 msgid "Version:"
 msgstr "รุ��:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:863
-msgid "Url:"
-msgstr "Url:"
+#: ../plugins/gbf-am/gbf-am-properties.c:866
+msgid "URI:"
+msgstr "URI:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1229
+#: ../plugins/gbf-am/gbf-am-properties.c:1232
 msgid "Use"
 msgstr "���"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1321
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:244
+#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
 msgid "Group name:"
 msgstr "�ื�อ�ลุ�ม:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1324
+#: ../plugins/gbf-am/gbf-am-properties.c:1327
 msgid "Advanced"
 msgstr "ระ�ั�สู�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1329
-#: ../plugins/gbf-am/gbf-am-properties.c:1419
+#: ../plugins/gbf-am/gbf-am-properties.c:1332
+#: ../plugins/gbf-am/gbf-am-properties.c:1422
 msgid "C compiler flags:"
 msgstr "��ล���อ��อม���ลอร�ภาษา�ี:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1331
+#: ../plugins/gbf-am/gbf-am-properties.c:1334
 msgid "C preprocessor flags:"
 msgstr "��ล���อ� preprocessor ภาษา�ี:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1333
+#: ../plugins/gbf-am/gbf-am-properties.c:1336
 msgid "C++ compiler flags:"
 msgstr "��ล���อ��อม���ลอร�ภาษา�ี�ลัส�ลัส:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1335
+#: ../plugins/gbf-am/gbf-am-properties.c:1338
 msgid "gcj compiler flags (ahead-of-time):"
 msgstr "��ล���อ��อม���ลอร� gcj (ahead-of-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1337
+#: ../plugins/gbf-am/gbf-am-properties.c:1340
 msgid "Java compiler flags (just-in-time):"
 msgstr "��ล���อ��อม���ลอร�ภาษา�าวา (just-in-time):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1339
-#: ../plugins/gbf-am/gbf-am-properties.c:1427
+#: ../plugins/gbf-am/gbf-am-properties.c:1342
+#: ../plugins/gbf-am/gbf-am-properties.c:1430
 msgid "Fortran compiler flags:"
 msgstr "��ล���อ��อม���ลอร�ภาษา�อร���ร�:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1342
+#: ../plugins/gbf-am/gbf-am-properties.c:1345
 msgid "Includes (deprecated):"
 msgstr "�า����มส�ว�หัว (�ม���ะ�ำ�ห����):"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1353
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:258
+#: ../plugins/gbf-am/gbf-am-properties.c:1356
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:261
 msgid "Install directories:"
 msgstr "���ร��อรี�ิ��ั��:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1421
+#: ../plugins/gbf-am/gbf-am-properties.c:1424
 msgid "C preprocessor flags"
 msgstr "��ล���อ� preprocessor ภาษา�ี"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1423
+#: ../plugins/gbf-am/gbf-am-properties.c:1426
 msgid "C++ compiler flags"
 msgstr "��ล���อ��อม���ลอร�ภาษา�ี�ลัส�ลัส:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1425
+#: ../plugins/gbf-am/gbf-am-properties.c:1428
 msgid "gcj compiler flags (ahead-of-time)"
 msgstr "��ล���อ��อม���ลอร� gcj (ahead-of-time)"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1431
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:410
+#: ../plugins/gbf-am/gbf-am-properties.c:1434
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:413
 msgid "Linker flags:"
 msgstr "��ล���อ�ลิ���อร�:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1437
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:416
+#: ../plugins/gbf-am/gbf-am-properties.c:1440
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:419
 msgid "Libraries:"
 msgstr "�ล�รารี:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1443
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:422
+#: ../plugins/gbf-am/gbf-am-properties.c:1446
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:425
 msgid "Dependencies:"
 msgstr "สิ���ี���อ����:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1446
+#: ../plugins/gbf-am/gbf-am-properties.c:1449
 msgid "Advanced options"
 msgstr "�ัว�ลือ�ระ�ั�สู�"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1521
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:347
+#: ../plugins/gbf-am/gbf-am-properties.c:1524
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:350
 msgid "Target name:"
 msgstr "�ื�อ���าหมาย:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1530
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:356
+#: ../plugins/gbf-am/gbf-am-properties.c:1533
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:359
 msgid "Group:"
 msgstr "�ลุ�ม:"
 
-#: ../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
+#: ../plugins/gbf-am/gbf-am-properties.c:1551
+#: ../plugins/gbf-am/gbf-am-properties.c:1567
+#: ../plugins/gbf-am/gbf-am-properties.c:1574
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:377
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:394
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:401
 msgid "Install directory:"
 msgstr "���ร��อรี�ิ��ั��:"
 
-#: ../plugins/gbf-am/gbf-am-properties.c:1583
-msgid "Advanced..."
-msgstr "ระ�ั�สู�..."
+#: ../plugins/gbf-am/gbf-am-properties.c:1586
+msgid "Advancedâ?¦"
+msgstr "ระ�ั�สู��"
 
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:102
 #: ../plugins/gbf-mkfile/gbf-mkfile-config.c:136
 msgid "Invalid GbfMkfileConfigValue type"
 msgstr "��ิ��อ� GbfMkfileConfigValue �ม��ู���อ�"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2524
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2525
 msgid "Project doesn't exist"
 msgstr "��ร��าร�ม�มีอยู�"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2831
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2832
 msgid "Group coudn't be removed"
 msgstr "�ม�สามาร�ล��ลุ�ม���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2994
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3021
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:2995
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3022
 msgid "Target couldn't be created"
 msgstr "�ม�สามาร�สร�า����าหมาย���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3054
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3055
 msgid "Target coudn't be removed"
 msgstr "�ม�สามาร�ล����าหมาย���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3252
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3253
 msgid "Source file must be inside the project directory"
 msgstr "���ม�อร�ส��อ�อยู�ภาย�����ร��อรี��ร��าร"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3264
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3265
 msgid "Source is already in target"
 msgstr "�อร�สมีอยู��ล�ว�����าหมาย"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3281
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3313
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3282
+#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3314
 msgid "Source couldn't be added"
 msgstr "�ม�สามาร���ิ�ม�อร�ส���"
 
-#: ../plugins/gbf-mkfile/gbf-mkfile-project.c:3345
-msgid "Source coudn't be removed"
-msgstr "�ม�สามาร�ล��อร�ส���"
-
-#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:247
+#: ../plugins/gbf-mkfile/gbf-mkfile-properties.c:250
 msgid "Includes:"
 msgstr "�า����มส�ว�หัว:"
 
 #. The %s argument is a program name, anjuta by example
-#: ../plugins/gdb/debugger.c:691
+#: ../plugins/gdb/debugger.c:712
 #, c-format
 msgid "Loading Executable: %s\n"
 msgstr "�ำลั��หล����ม��ร��รม: %s\n"
 
 #. The %s argument is a file name
-#: ../plugins/gdb/debugger.c:722
+#: ../plugins/gdb/debugger.c:743
 #, c-format
 msgid "Loading Core: %s\n"
 msgstr "�ำลั��หล� Core: %s\n"
 
-#: ../plugins/gdb/debugger.c:804
+#: ../plugins/gdb/debugger.c:828
 #, c-format
 msgid ""
 "Unable to find: %s.\n"
@@ -4113,58 +4217,58 @@ msgstr ""
 "�ริ�ม��ร��รม�ี�ั���ม����\n"
 "�รุ�า�รว�สอ��ห������ว�า�ิ��ั���อ��ู�า�ู���อ�"
 
-#: ../plugins/gdb/debugger.c:933
-msgid "Getting ready to start debugging session...\n"
-msgstr "�ำลั���รียม�ร�อมสำหรั��าร�ริ�ม���วาระ�าร�ี�ั��...\n"
+#: ../plugins/gdb/debugger.c:973
+msgid "Getting ready to start debugging sessionâ?¦\n"
+msgstr "�ำลั���รียม�ร�อมสำหรั��าร�ริ�ม���วาระ�าร�ี�ั���\n"
 
-#: ../plugins/gdb/debugger.c:939
+#: ../plugins/gdb/debugger.c:979
 msgid "Loading Executable: "
 msgstr "�ำลั��หล����ม��ร��รม: "
 
-#: ../plugins/gdb/debugger.c:948
+#: ../plugins/gdb/debugger.c:988
 msgid "No executable specified.\n"
 msgstr "�ม����ระ�ุ���ม��ร��รม\n"
 
-#: ../plugins/gdb/debugger.c:951
+#: ../plugins/gdb/debugger.c:991
 msgid "Open an executable or attach to a process to start debugging.\n"
 msgstr "��ิ���ร��รมหรือ����ั���ร��ส��ื�อ�ริ�ม�ี�ั��\n"
 
-#: ../plugins/gdb/debugger.c:960
+#: ../plugins/gdb/debugger.c:1000
 msgid "There was an error whilst launching the debugger.\n"
 msgstr "��ิ���อ�ิ��ลา���ะ�รีย���ร��รม�ี�ั��\n"
 
-#: ../plugins/gdb/debugger.c:964
+#: ../plugins/gdb/debugger.c:1004
 msgid "Make sure 'gdb' is installed on the system.\n"
 msgstr "�รุ�า�รว�สอ��ห������ว�า����ิ��ั�� 'gdb' ��ระ���ล�ว\n"
 
-#: ../plugins/gdb/debugger.c:1255
+#: ../plugins/gdb/debugger.c:1294
 msgid "Program exited normally\n"
 msgstr "��ร��รม���าม���ิ\n"
 
-#: ../plugins/gdb/debugger.c:1266
+#: ../plugins/gdb/debugger.c:1305
 #, c-format
 msgid "Program exited with error code %s\n"
 msgstr "��ร��รม����วยรหัส��อ�ิ��ลา� %s\n"
 
 #. The program has reached one breakpoint and will stop
-#: ../plugins/gdb/debugger.c:1281
+#: ../plugins/gdb/debugger.c:1320
 #, c-format
 msgid "Breakpoint number %s hit\n"
 msgstr "�ึ��ุ��ั�หมาย�ล� %s\n"
 
-#: ../plugins/gdb/debugger.c:1290
+#: ../plugins/gdb/debugger.c:1329
 msgid "Function finished\n"
 msgstr "���ั����ั��ล�ว\n"
 
-#: ../plugins/gdb/debugger.c:1296
+#: ../plugins/gdb/debugger.c:1335
 msgid "Stepping finished\n"
 msgstr "���าร�ำ�ีละ�ั���ล�ว\n"
 
-#: ../plugins/gdb/debugger.c:1302
+#: ../plugins/gdb/debugger.c:1341
 msgid "Location reached\n"
 msgstr "�ึ��ำ�ห����ล�ว\n"
 
-#: ../plugins/gdb/debugger.c:1696
+#: ../plugins/gdb/debugger.c:1735
 msgid ""
 "The program is attached.\n"
 "Do you still want to stop the debugger?"
@@ -4174,7 +4278,7 @@ msgstr ""
 
 #. The %s argument is an error message returned by gdb.
 #. * It is something like, "No such file or directory"
-#: ../plugins/gdb/debugger.c:1857
+#: ../plugins/gdb/debugger.c:1896
 #, c-format
 msgid ""
 "Unable to connect to remote target, %s\n"
@@ -4183,20 +4287,20 @@ msgstr ""
 "�ม�สามาร���ื�อม��ยั����าหมาย����รือ��าย��� %s\n"
 "�ุ���อ��ารลอ��หม�อี��รั��หรือ�ม�?"
 
-#: ../plugins/gdb/debugger.c:1875
+#: ../plugins/gdb/debugger.c:1914
 msgid "Debugger connected\n"
 msgstr "��ื�อม��อ�ั���ร��รม�ี�ั���ล�ว\n"
 
-#: ../plugins/gdb/debugger.c:1949
+#: ../plugins/gdb/debugger.c:1988
 msgid "Program attached\n"
 msgstr "����ั���ร��รม�ล�ว\n"
 
-#: ../plugins/gdb/debugger.c:1970
+#: ../plugins/gdb/debugger.c:2009
 #, c-format
-msgid "Attaching to process: %d...\n"
-msgstr "�ำลั�����ั���ร��ส: %d...\n"
+msgid "Attaching to process: %dâ?¦\n"
+msgstr "�ำลั�����ั���ร��ส: %d�\n"
 
-#: ../plugins/gdb/debugger.c:1996
+#: ../plugins/gdb/debugger.c:2035
 msgid ""
 "A process is already running.\n"
 "Would you like to terminate it and attach the new process?"
@@ -4204,526 +4308,513 @@ msgstr ""
 "มี��ร��ส�ำลั��ำ�า�อยู�\n"
 "�ุ���อ��ารหยุ���ร��ส�ั��ล�าว �ละ������า�ั���ร��ส�หม�หรือ�ม�?"
 
-#: ../plugins/gdb/debugger.c:2013
+#: ../plugins/gdb/debugger.c:2052
 msgid "Anjuta is unable to attach to itself."
 msgstr "�อ��ู�า�ม�สามาร�����ั��ัว�อ����"
 
-#: ../plugins/gdb/debugger.c:2063
+#: ../plugins/gdb/debugger.c:2102
 msgid "Program terminated\n"
 msgstr "��ร��รม���าร�ำ�า�\n"
 
-#: ../plugins/gdb/debugger.c:2078
+#: ../plugins/gdb/debugger.c:2117
 msgid "Program detached\n"
 msgstr "�ย���ร��รมออ��ล�ว\n"
 
-#: ../plugins/gdb/debugger.c:2098
+#: ../plugins/gdb/debugger.c:2137
 #, c-format
-msgid "Detaching the process...\n"
-msgstr "�ำลั��ย���ร��สออ�...\n"
+msgid "Detaching the processâ?¦\n"
+msgstr "�ำลั��ย���ร��สออ��\n"
 
-#: ../plugins/gdb/debugger.c:2119
+#: ../plugins/gdb/debugger.c:2158
 msgid "Interrupting the process\n"
 msgstr "�ำลั��ั��ั�หวะ��ร��ส\n"
 
-#: ../plugins/gdb/debugger.c:3910
+#: ../plugins/gdb/debugger.c:3949
 #, c-format
 msgid "Sending signal %s to the process: %d"
 msgstr "�ำลั�ส��สั��า� %s ���ี���ร��ส: %d"
 
-#: ../plugins/gdb/debugger.c:3936
+#: ../plugins/gdb/debugger.c:3975
 msgid "Error whilst signaling the process."
 msgstr "��ิ���อ�ิ��ลา���ะส��สั��า����ี���ร��ส"
 
 #: ../plugins/gdb/plugin.c:112
 #, c-format
 msgid ""
-"Failed to create fifo file named %s. The program will run without a terminal."
-msgstr "สร�า����ม fifo �ื�อ %s �ม�สำ�ร�� ��ร��รม�ะ�ำ�า���ย�ม������อร�มิ�ัล"
+"Failed to create FIFO file named %s. The program will run without a terminal."
+msgstr "สร�า����ม FIFO �ื�อ %s �ม�สำ�ร�� ��ร��รม�ะ�ำ�า���ย�ม������อร�มิ�ัล"
 
 #: ../plugins/gdb/plugin.c:198
 msgid "Cannot start terminal for debugging."
 msgstr "�ม�สามาร��ริ�ม��อร�มิ�ัลสำหรั��ี�ั��"
 
-#: ../plugins/git/anjuta-git.ui.h:2
-msgid "<b>Stash Message (Optional)</b>"
-msgstr "<b>��อ�วาม Stash (มีหรือ�ม������)</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:3
-msgid "<b>Stash to Apply</b>"
-msgstr "<b>Stash �ี��ะ���</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:4
-msgid "<b>Tags</b>"
-msgstr "<b>����:</b>"
-
-#: ../plugins/git/anjuta-git.ui.h:5
+#: ../plugins/git/anjuta-git.ui.h:1
 msgid "Add File"
 msgstr "��ิ�ม���ม"
 
-#: ../plugins/git/anjuta-git.ui.h:6
+#: ../plugins/git/anjuta-git.ui.h:2
 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.ui.h:8
-msgid "Add signed off by line"
-msgstr "��ิ�ม�รร�ั������ำ�ั���ย"
-
-#: ../plugins/git/anjuta-git.ui.h:9
-msgid "Add signed-off by line"
-msgstr "��ิ�ม�รร�ั������ำ�ั���ย"
+#: ../plugins/git/anjuta-git.ui.h:4
+msgid "Add signed-off-by line"
+msgstr "��ิ�ม�รร�ั� signed-off-by"
 
-#: ../plugins/git/anjuta-git.ui.h:10
+#: ../plugins/git/anjuta-git.ui.h:5
 msgid "Amend the previous commit"
 msgstr "��อม commit ��อ�ห��า"
 
-#: ../plugins/git/anjuta-git.ui.h:11
+#: ../plugins/git/anjuta-git.ui.h:6
 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.ui.h:13
+#: ../plugins/git/anjuta-git.ui.h:8
 msgid "Append fetch data"
 msgstr "��ิ�ม��อมูล�ี� fetch มา��อ��าย"
 
-#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/git/anjuta-git.ui.h:9
 msgid "Apply Stash"
 msgstr "��� Stash"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/anjuta-git.ui.h:15 ../plugins/git/plugin.c:239
+#: ../plugins/git/anjuta-git.ui.h:10 ../plugins/git/plugin.c:239
 msgid "Apply mailbox files"
 msgstr "�ำ��ิ��าร��ย������ม�ล�อ���หมาย"
 
-#: ../plugins/git/anjuta-git.ui.h:16
+#: ../plugins/git/anjuta-git.ui.h:11
 msgid "Apply the selected stash"
 msgstr "��� stash �ี��ลือ�"
 
 #. "Author" means search for commits whose author matches the given grep expression. "Grep" searches through commit logs and patches.
-#: ../plugins/git/anjuta-git.ui.h:18
+#: ../plugins/git/anjuta-git.ui.h:13
 msgid "Author/Grep"
 msgstr "�ู���ีย�/Grep"
 
-#: ../plugins/git/anjuta-git.ui.h:19
-#: ../plugins/project-wizard/templates/translatable-strings.h:24
+#: ../plugins/git/anjuta-git.ui.h:14
+#: ../plugins/project-wizard/templates/translatable-strings.h:25
 msgid "Author:"
 msgstr "�ู���ีย�:"
 
-#: ../plugins/git/anjuta-git.ui.h:20
+#: ../plugins/git/anjuta-git.ui.h:15
 msgid "Bad revision:"
 msgstr "��ั�������ี��สียหาย:"
 
-#: ../plugins/git/anjuta-git.ui.h:21
+#: ../plugins/git/anjuta-git.ui.h:16
 msgid "Branch name:"
 msgstr "�ื�อ����:"
 
-#: ../plugins/git/anjuta-git.ui.h:22
+#: ../plugins/git/anjuta-git.ui.h:17
 msgid "Branch to switch to:"
 msgstr "�����ี��ะสลั���:"
 
-#: ../plugins/git/anjuta-git.ui.h:23
+#: ../plugins/git/anjuta-git.ui.h:18
 msgid "Branch:"
 msgstr "����:"
 
-#: ../plugins/git/anjuta-git.ui.h:24
+#: ../plugins/git/anjuta-git.ui.h:19
 msgid "Branches"
 msgstr "����"
 
-#: ../plugins/git/anjuta-git.ui.h:25
+#: ../plugins/git/anjuta-git.ui.h:20
 msgid "Branches must be fully merged"
 msgstr "������า�� �ะ��อ��สา��ร��ั��หม�"
 
-#: ../plugins/git/anjuta-git.ui.h:26
+#: ../plugins/git/anjuta-git.ui.h:21
 msgid "Branches to delete:"
 msgstr "�����ี��ะล�:"
 
-#: ../plugins/git/anjuta-git.ui.h:28
+#: ../plugins/git/anjuta-git.ui.h:23
 #: ../plugins/subversion/anjuta-subversion.ui.h:4
 msgid "Changes:"
 msgstr "�าร��ลี�ย���ล�:"
 
-#: ../plugins/git/anjuta-git.ui.h:29
+#: ../plugins/git/anjuta-git.ui.h:24
 msgid "Check Out Files"
 msgstr "Check Out ���ม"
 
-#: ../plugins/git/anjuta-git.ui.h:30
+#: ../plugins/git/anjuta-git.ui.h:25
 msgid "Check out all local changes"
 msgstr "Check out �าร��ลี�ย���ล��ั��หม�����รื�อ�"
 
-#: ../plugins/git/anjuta-git.ui.h:31
+#: ../plugins/git/anjuta-git.ui.h:26
 msgid "Check out the branch after it is created"
 msgstr "Check out ����หลั��า�สร�า��สร��"
 
-#: ../plugins/git/anjuta-git.ui.h:32
+#: ../plugins/git/anjuta-git.ui.h:27
 msgid "Cherry Pick"
 msgstr "������ี�ยว"
 
-#: ../plugins/git/anjuta-git.ui.h:33
+#: ../plugins/git/anjuta-git.ui.h:28
 msgid "Clear all stashes"
 msgstr "ล�า� stash �ั��หม�"
 
-#: ../plugins/git/anjuta-git.ui.h:34
+#: ../plugins/git/anjuta-git.ui.h:29
 msgid "Column 1"
 msgstr "�อลัม�� 1"
 
-#: ../plugins/git/anjuta-git.ui.h:35
+#: ../plugins/git/anjuta-git.ui.h:30
 #: ../plugins/subversion/anjuta-subversion.ui.h:7
 msgid "Commit Changes"
 msgstr "Commit �าร��ลี�ย���ล�"
 
-#: ../plugins/git/anjuta-git.ui.h:36
+#: ../plugins/git/anjuta-git.ui.h:31
 msgid "Commit on fast-forward merges"
 msgstr "Commit �มื�อ�สา���� fast-forward"
 
-#: ../plugins/git/anjuta-git.ui.h:37
+#: ../plugins/git/anjuta-git.ui.h:32
 msgid "Commit to Cherry Pick:"
 msgstr "Commit �ี��ะ������ี�ยวมา���:"
 
-#: ../plugins/git/anjuta-git.ui.h:38
+#: ../plugins/git/anjuta-git.ui.h:33
 msgid "Commit to revert:"
 msgstr "Commit �ี��ะย�อ��ื�:"
 
-#: ../plugins/git/anjuta-git.ui.h:39
+#: ../plugins/git/anjuta-git.ui.h:34
 msgid "Create Branch"
 msgstr "สร�า�����"
 
-#: ../plugins/git/anjuta-git.ui.h:40
+#: ../plugins/git/anjuta-git.ui.h:35
 msgid "Create Tag"
 msgstr "สร�า�����"
 
-#: ../plugins/git/anjuta-git.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:36
 msgid "Create patch series"
 msgstr "สร�า��ุ�ลำ�ั������"
 
-#: ../plugins/git/anjuta-git.ui.h:42 ../plugins/git/git-log-dialog.c:189
+#: ../plugins/git/anjuta-git.ui.h:37 ../plugins/git/git-log-dialog.c:189
 #: ../plugins/subversion/subversion-log-dialog.c:141
 msgid "Date"
 msgstr "วั��ี�"
 
-#: ../plugins/git/anjuta-git.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:38
 msgid "Delete Branch"
 msgstr "ล�����"
 
-#: ../plugins/git/anjuta-git.ui.h:44
+#: ../plugins/git/anjuta-git.ui.h:39
 msgid "Delete Remote Branch"
 msgstr "ล������ี��ม���าย"
 
-#: ../plugins/git/anjuta-git.ui.h:45
+#: ../plugins/git/anjuta-git.ui.h:40
 msgid "Delete Tags"
 msgstr "ล�����"
 
-#: ../plugins/git/anjuta-git.ui.h:46
+#: ../plugins/git/anjuta-git.ui.h:41
 msgid "Do not commit"
 msgstr "�ม� commit"
 
-#: ../plugins/git/anjuta-git.ui.h:47
+#: ../plugins/git/anjuta-git.ui.h:42
 msgid "Do not follow tags"
 msgstr "�ม���อ��าม����"
 
-#: ../plugins/git/anjuta-git.ui.h:48
+#: ../plugins/git/anjuta-git.ui.h:43
 msgid "Drop the selected stash"
 msgstr "�ิ�� stash �ี��ลือ�"
 
-#: ../plugins/git/anjuta-git.ui.h:49
+#: ../plugins/git/anjuta-git.ui.h:44
 msgid "E-mail:"
 msgstr "อี�มล:"
 
-#: ../plugins/git/anjuta-git.ui.h:50
+#: ../plugins/git/anjuta-git.ui.h:45
 msgid "Fetch remote branches after creation"
 msgstr "Fetch �����า��ม���ายหลั��า�สร�า��สร��"
 
-#: ../plugins/git/anjuta-git.ui.h:51
+#: ../plugins/git/anjuta-git.ui.h:46
 msgid "Filters"
 msgstr "�ัว�รอ�"
 
-#: ../plugins/git/anjuta-git.ui.h:52
+#: ../plugins/git/anjuta-git.ui.h:47
 msgid "Folder to create patches in:"
 msgstr "��ล��อร��ี��ะสร�า������:"
 
-#: ../plugins/git/anjuta-git.ui.h:53
+#: ../plugins/git/anjuta-git.ui.h:48
 #: ../plugins/subversion/anjuta-subversion.ui.h:19
 msgid "Force"
 msgstr "�ั��ั�"
 
-#: ../plugins/git/anjuta-git.ui.h:55
+#: ../plugins/git/anjuta-git.ui.h:50
 msgid "From:"
 msgstr "�า�:"
 
-#: ../plugins/git/anjuta-git.ui.h:56
+#: ../plugins/git/anjuta-git.ui.h:51
 msgid "Generate patches relative to:"
 msgstr "สร�า��������ีย��ั�:"
 
-#: ../plugins/git/anjuta-git.ui.h:57
+#: ../plugins/git/anjuta-git.ui.h:52
 msgid "Good revision:"
 msgstr "��ั�������ี�����าร���:"
 
-#: ../plugins/git/anjuta-git.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:53
 msgid "Grep:"
 msgstr "Grep:"
 
-#: ../plugins/git/anjuta-git.ui.h:59
+#: ../plugins/git/anjuta-git.ui.h:54
 msgid "Hard"
 msgstr "����"
 
-#: ../plugins/git/anjuta-git.ui.h:60
+#: ../plugins/git/anjuta-git.ui.h:55
 msgid "Head"
 msgstr "Head"
 
-#: ../plugins/git/anjuta-git.ui.h:61
+#: ../plugins/git/anjuta-git.ui.h:56
 msgid "Ignore Files"
 msgstr "ละ�ลย���ม"
 
-#: ../plugins/git/anjuta-git.ui.h:63
+#: ../plugins/git/anjuta-git.ui.h:58
 #: ../plugins/subversion/anjuta-subversion.ui.h:21
 msgid "Log Message:"
 msgstr "��อ�วาม�ูม:"
 
-#: ../plugins/git/anjuta-git.ui.h:65
+#: ../plugins/git/anjuta-git.ui.h:60
 msgid "Mailbox file containing patches:"
 msgstr "���ม�ล�อ���หมาย�ี�มี�����:"
 
-#: ../plugins/git/anjuta-git.ui.h:66
+#: ../plugins/git/anjuta-git.ui.h:61
 msgid "Merge"
 msgstr "�สา�"
 
-#: ../plugins/git/anjuta-git.ui.h:67
+#: ../plugins/git/anjuta-git.ui.h:62
 msgid "Mixed"
 msgstr "�สม"
 
-#: ../plugins/git/anjuta-git.ui.h:68
+#: ../plugins/git/anjuta-git.ui.h:63
 msgid "Mode:"
 msgstr "�หม�:"
 
-#: ../plugins/git/anjuta-git.ui.h:70 ../plugins/glade/plugin.c:3097
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
-#: ../plugins/subversion/anjuta-subversion.ui.h:23
-msgid "Options"
-msgstr "�ัว�ลือ�"
-
-#: ../plugins/git/anjuta-git.ui.h:71
-#: ../plugins/subversion/anjuta-subversion.ui.h:24
-msgid "Options:"
-msgstr "�ัว�ลือ�:"
-
-#: ../plugins/git/anjuta-git.ui.h:72
+#: ../plugins/git/anjuta-git.ui.h:67
 msgid "Previous commit"
 msgstr "Commit ��อ�ห��า"
 
-#: ../plugins/git/anjuta-git.ui.h:73
+#: ../plugins/git/anjuta-git.ui.h:68
 msgid "Pull"
 msgstr "Pull"
 
-#: ../plugins/git/anjuta-git.ui.h:74
+#: ../plugins/git/anjuta-git.ui.h:69
 msgid "Push"
 msgstr "Push"
 
-#: ../plugins/git/anjuta-git.ui.h:75
+#: ../plugins/git/anjuta-git.ui.h:70
 msgid "Push all branches and tags"
 msgstr "Push �����ละ�����ั��หม�"
 
-#: ../plugins/git/anjuta-git.ui.h:76
+#: ../plugins/git/anjuta-git.ui.h:71
 msgid "Push all tags"
 msgstr "Push tag �ั��หม�"
 
-#: ../plugins/git/anjuta-git.ui.h:77
+#: ../plugins/git/anjuta-git.ui.h:72
 msgid "Rebase"
 msgstr "Rebase"
 
-#: ../plugins/git/anjuta-git.ui.h:78
+#: ../plugins/git/anjuta-git.ui.h:73
 msgid "Remote"
 msgstr "�ม���าย"
 
-#: ../plugins/git/anjuta-git.ui.h:79
+#: ../plugins/git/anjuta-git.ui.h:74
 msgid "Remote branch to rebase from:"
 msgstr "�����ี��ม���าย�ี��ะ��� rebase:"
 
-#: ../plugins/git/anjuta-git.ui.h:80
+#: ../plugins/git/anjuta-git.ui.h:75
 msgid "Remote to delete:"
 msgstr "ราย�าร�ี��ม���าย�ี��ะล�:"
 
-#: ../plugins/git/anjuta-git.ui.h:81
+#: ../plugins/git/anjuta-git.ui.h:76
 msgid "Remove File"
 msgstr "ล����ม"
 
-#: ../plugins/git/anjuta-git.ui.h:82
+#: ../plugins/git/anjuta-git.ui.h:77
 msgid "Repository origin"
 msgstr "�����ั��อ��ลั�"
 
-#: ../plugins/git/anjuta-git.ui.h:83
+#: ../plugins/git/anjuta-git.ui.h:78
 msgid "Repository to pull from:"
 msgstr "�ลั��ี��ะ pull:"
 
-#: ../plugins/git/anjuta-git.ui.h:84
+#: ../plugins/git/anjuta-git.ui.h:79
 msgid "Repository to push to:"
 msgstr "�ลั��ี��ะ push ��:"
 
-#: ../plugins/git/anjuta-git.ui.h:85
+#: ../plugins/git/anjuta-git.ui.h:80
 msgid "Reset Tree"
 msgstr "ล�า���อมูล Tree"
 
-#: ../plugins/git/anjuta-git.ui.h:86
+#: ../plugins/git/anjuta-git.ui.h:81
 msgid "Reset to:"
 msgstr "ล�า���อมูล����:"
 
-#: ../plugins/git/anjuta-git.ui.h:87
+#: ../plugins/git/anjuta-git.ui.h:82
 msgid "Restore index"
 msgstr "�ื�สภา��ั��ี"
 
-#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/git/anjuta-git.ui.h:83
 #: ../plugins/subversion/anjuta-subversion.ui.h:35
-msgid "Retrieving status..."
-msgstr "�ำลั��ึ�ส�า�ะ..."
+msgid "Retrieving statusâ?¦"
+msgstr "�ำลั��ึ�ส�า�ะ�"
 
-#: ../plugins/git/anjuta-git.ui.h:89
+#: ../plugins/git/anjuta-git.ui.h:84
 msgid "Revert Commit"
 msgstr "�รีย� Commit �ื�"
 
-#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/git/anjuta-git.ui.h:85
 msgid "Revision/Tag:"
 msgstr "��ั������/����:"
 
-#: ../plugins/git/anjuta-git.ui.h:92
-msgid "Select A Folder"
-msgstr "�ลือ���ล��อร�"
-
-#: ../plugins/git/anjuta-git.ui.h:93
+#: ../plugins/git/anjuta-git.ui.h:87
 msgid "Select Files to Check Out:"
 msgstr "�ลือ����ม�ี��ะ Check Out:"
 
-#: ../plugins/git/anjuta-git.ui.h:94
-#: ../plugins/subversion/anjuta-subversion.ui.h:41
+#: ../plugins/git/anjuta-git.ui.h:88
+#: ../plugins/subversion/anjuta-subversion.ui.h:42
 msgid "Select Files to Commit:"
 msgstr "�ลือ����ม�ี��ะ Commit:"
 
-#: ../plugins/git/anjuta-git.ui.h:95
+#: ../plugins/git/anjuta-git.ui.h:89
 msgid "Select Files to Ignore:"
 msgstr "�ลือ����ม�ี��ะละ�ลย:"
 
-#: ../plugins/git/anjuta-git.ui.h:96
-#: ../plugins/subversion/anjuta-subversion.ui.h:42
+#: ../plugins/git/anjuta-git.ui.h:90
+#: ../plugins/subversion/anjuta-subversion.ui.h:43
 msgid "Select Files to Mark as Resolved:"
 msgstr "�ลือ����ม�ี��ะ�ำ��รื�อ�หมายว�า�����อ�ั��ย���ล�ว:"
 
-#: ../plugins/git/anjuta-git.ui.h:97
+#: ../plugins/git/anjuta-git.ui.h:91
 msgid "Select Files to Unstage:"
 msgstr "�ลือ����ม�ี��ะ Unstage:"
 
-#: ../plugins/git/anjuta-git.ui.h:98
+#: ../plugins/git/anjuta-git.ui.h:92
 msgid "Select Mailbox File"
 msgstr "�ลือ����ม Mailbox"
 
-#: ../plugins/git/anjuta-git.ui.h:99
+#: ../plugins/git/anjuta-git.ui.h:93
+msgid "Select a Folder"
+msgstr "�ลือ���ล��อร�"
+
+#: ../plugins/git/anjuta-git.ui.h:94
 msgid "Select file to add:"
 msgstr "�ลือ����ม�ี��ะ��ิ�ม"
 
-#: ../plugins/git/anjuta-git.ui.h:100
+#: ../plugins/git/anjuta-git.ui.h:95
 msgid "Select file to remove:"
 msgstr "�ลือ����ม�ี�ล�:"
 
-#: ../plugins/git/anjuta-git.ui.h:101
-#: ../plugins/subversion/anjuta-subversion.ui.h:43
+#: ../plugins/git/anjuta-git.ui.h:96
+#: ../plugins/subversion/anjuta-subversion.ui.h:44
 msgid "Set Conflicts as Resolved"
 msgstr "�ำห�����ม�ี��ั��ย��ว�า�����อ�ั��ย���ล�ว"
 
-#: ../plugins/git/anjuta-git.ui.h:102
+#: ../plugins/git/anjuta-git.ui.h:97
 msgid "Show source revision in log message"
 msgstr "�ส��รุ���อ��อร�ส����อ�วาม�ูม"
 
-#: ../plugins/git/anjuta-git.ui.h:103
+#: ../plugins/git/anjuta-git.ui.h:98
 msgid "Show the contents of the selected stash in an editor"
 msgstr "�ส����ื�อหา�อ� stash �ี��ลือ���วย��รื�อ�มือ�����"
 
-#: ../plugins/git/anjuta-git.ui.h:104
+#: ../plugins/git/anjuta-git.ui.h:99
 msgid "Sign this tag"
 msgstr "�����ำ�ั������ี�"
 
-#: ../plugins/git/anjuta-git.ui.h:105
+#: ../plugins/git/anjuta-git.ui.h:100
 msgid "Soft"
 msgstr "อ�อ�"
 
-#: ../plugins/git/anjuta-git.ui.h:106
+#: ../plugins/git/anjuta-git.ui.h:101
 msgid "Squash"
 msgstr "อั�รวม"
 
-#: ../plugins/git/anjuta-git.ui.h:107 ../plugins/git/plugin.c:811
+#: ../plugins/git/anjuta-git.ui.h:102 ../plugins/git/plugin.c:811
 msgid "Stash"
 msgstr "Stash"
 
-#: ../plugins/git/anjuta-git.ui.h:108
+#: ../plugins/git/anjuta-git.ui.h:103
+msgid "Stash Message (Optional)"
+msgstr "��อ�วาม Stash (มีหรือ�ม������)"
+
+#: ../plugins/git/anjuta-git.ui.h:104
 msgid "Stash Uncommitted Changes"
 msgstr "Stash �าร��ลี�ย���ล��ี�ยั��ม� commit"
 
-#: ../plugins/git/anjuta-git.ui.h:109
+#: ../plugins/git/anjuta-git.ui.h:105
 msgid "Stash indexed changes"
 msgstr "Stash �าร��ลี�ย���ล��ี��ำ�ั��ี�ว�"
 
-#: ../plugins/git/anjuta-git.ui.h:110
+#: ../plugins/git/anjuta-git.ui.h:106
 msgid "Stash the working tree's uncommitted changes"
 msgstr "Stash �าร��ลี�ย���ล��ี�ยั��ม� commit �อ� tree �ี��ำ�า�อยู�"
 
-#: ../plugins/git/anjuta-git.ui.h:111
+#: ../plugins/git/anjuta-git.ui.h:107
+msgid "Stash to Apply"
+msgstr "Stash �ี��ะ���"
+
+#: ../plugins/git/anjuta-git.ui.h:108
 msgid "Switch to Another Branch"
 msgstr "สลั�������อื��"
 
-#: ../plugins/git/anjuta-git.ui.h:112
+#: ../plugins/git/anjuta-git.ui.h:109
 msgid "Tag name:"
 msgstr "�ื�อ����:"
 
-#: ../plugins/git/anjuta-git.ui.h:113
+#: ../plugins/git/anjuta-git.ui.h:110
 msgid "Tag/Commit"
 msgstr "����/Commit"
 
-#: ../plugins/git/anjuta-git.ui.h:114
+#. Action name
+#. Stock icon, if any
+#: ../plugins/git/anjuta-git.ui.h:111 ../plugins/git/plugin.c:391
+msgid "Tags"
+msgstr "����"
+
+#: ../plugins/git/anjuta-git.ui.h:112
 msgid "Tags to delete:"
 msgstr "�����ี��ะล�:"
 
-#: ../plugins/git/anjuta-git.ui.h:115
+#: ../plugins/git/anjuta-git.ui.h:113
 msgid "This commit concludes a failed merge (use -i)"
 msgstr "commit �ี�สรุ��าร�สา��ี��ม�สำ�ร�� (��� -i)"
 
-#: ../plugins/git/anjuta-git.ui.h:117
+#: ../plugins/git/anjuta-git.ui.h:115
 msgid "To:"
 msgstr "�ึ�:"
 
-#: ../plugins/git/anjuta-git.ui.h:118
+#: ../plugins/git/anjuta-git.ui.h:116
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/git/anjuta-git.ui.h:119
+#: ../plugins/git/anjuta-git.ui.h:117
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/git/anjuta-git.ui.h:120
+#: ../plugins/git/anjuta-git.ui.h:118
 msgid "Unstage Files"
 msgstr "Unstage ���ม"
 
-#: ../plugins/git/anjuta-git.ui.h:121
+#: ../plugins/git/anjuta-git.ui.h:119
 msgid "Use a custom log message"
 msgstr "�ำห����อ�วาม�ูม�อ�"
 
-#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/git/anjuta-git.ui.h:120
 msgid "Use custom author information:"
 msgstr "�ำห����อมูล�ู���ีย�:"
 
-#: ../plugins/git/anjuta-git.ui.h:123
+#: ../plugins/git/anjuta-git.ui.h:121
 msgid "View log"
 msgstr "�ู�ูม"
 
-#: ../plugins/git/anjuta-git.ui.h:124
-#: ../plugins/subversion/anjuta-subversion.ui.h:58
+#: ../plugins/git/anjuta-git.ui.h:122
+#: ../plugins/subversion/anjuta-subversion.ui.h:59
 msgid "View the Log for File/Folder:"
 msgstr "�ู�ูม�อ����ม/��ล��อร�:"
 
-#: ../plugins/git/anjuta-git.ui.h:126
+#: ../plugins/git/anjuta-git.ui.h:124
 msgid "page 1"
 msgstr "ห��า 1"
 
-#: ../plugins/git/anjuta-git.ui.h:127
+#: ../plugins/git/anjuta-git.ui.h:125
 msgid "page 2"
 msgstr "ห��า 2"
 
-#: ../plugins/git/anjuta-git.ui.h:128
+#: ../plugins/git/anjuta-git.ui.h:126
 msgid "page 3"
 msgstr "ห��า 3"
 
@@ -4751,8 +4842,8 @@ msgstr "�รุ�า��อ� URL"
 
 #: ../plugins/git/git-add-remote-dialog.c:111
 #: ../plugins/git/git-fetch-dialog.c:54
-msgid "Git: Fetching..."
-msgstr "Git: �ำลั� fetch..."
+msgid "Git: Fetchingâ?¦"
+msgstr "Git: �ำลั� fetch�"
 
 #: ../plugins/git/git-apply-mailbox-dialog.c:45
 msgid "Please select a mailbox file."
@@ -4832,8 +4923,8 @@ msgid "Author"
 msgstr "�ู���ีย�"
 
 #: ../plugins/git/git-log-dialog.c:317
-msgid "Git: Retrieving log..."
-msgstr "Git: �ำลั��ึ��ูม..."
+msgid "Git: Retrieving logâ?¦"
+msgstr "Git: �ำลั��ึ��ูม�"
 
 #: ../plugins/git/git-log-dialog.c:360
 #: ../plugins/subversion/subversion-add-dialog.c:65
@@ -4891,17 +4982,17 @@ msgstr "Git: push �สร��สม�ูร��"
 
 #. The "input widget" is the widget that should receive focus if the
 #. * user does not properly enter anything
-#: ../plugins/git/git-push-dialog.c:141
+#: ../plugins/git/git-push-dialog.c:144
 msgid "Please select a remote to push to."
 msgstr "�รุ�า�ลือ��ม���าย�ี��ะ push ��"
 
-#: ../plugins/git/git-push-dialog.c:159
+#: ../plugins/git/git-push-dialog.c:162
 msgid "Please enter the URL of the repository to push to."
 msgstr "�รุ�า��อ� URL �อ��ลั��ี��ะ push ��"
 
-#: ../plugins/git/git-push-dialog.c:193
-msgid "Git: Pushing..."
-msgstr "Git: �ำลั� push..."
+#: ../plugins/git/git-push-dialog.c:197
+msgid "Git: Pushingâ?¦"
+msgstr "Git: �ำลั� push�"
 
 #: ../plugins/git/git-rebase-dialog.c:60
 msgid "Git: Rebasing"
@@ -4976,8 +5067,8 @@ msgstr "_�าร��ลี�ย���ล�"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:87 ../plugins/subversion/plugin.c:76
-msgid "_Commit..."
-msgstr "_Commit..."
+msgid "_Commitâ?¦"
+msgstr "_Commitâ?¦"
 
 #. Display label
 #. short-cut
@@ -5006,8 +5097,8 @@ msgstr "_Stash"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:111
-msgid "_Stash uncommitted changes..."
-msgstr "_Stash �าร��ลี�ย���ล��ี�ยั��ม� commit..."
+msgid "_Stash uncommitted changesâ?¦"
+msgstr "_Stash �าร��ลี�ย���ล��ี�ยั��ม� commit�"
 
 #. Display label
 #. short-cut
@@ -5018,8 +5109,8 @@ msgstr "�ั��ึ��าร��ลี�ย���ล��ี�ย
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:119
-msgid "_Apply stashed changes..."
-msgstr "�_���าร��ลี�ย���ล��ี� stash �ว�..."
+msgid "_Apply stashed changesâ?¦"
+msgstr "�_���าร��ลี�ย���ล��ี� stash �ว��"
 
 #. Display label
 #. short-cut
@@ -5030,8 +5121,8 @@ msgstr "����าร��ลี�ย���ล��ี� stash �
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:127 ../plugins/git/plugin.c:583
-msgid "_View log..."
-msgstr "_�ู�ูม..."
+msgid "_View logâ?¦"
+msgstr "�ู�ู_ม�"
 
 #. Display label
 #. short-cut
@@ -5048,8 +5139,8 @@ msgstr "�ลั�����รือ_��าย"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:143
-msgid "_Push..."
-msgstr "_Push..."
+msgid "_Pushâ?¦"
+msgstr "_Pushâ?¦"
 
 #. Display label
 #. short-cut
@@ -5060,8 +5151,8 @@ msgstr "Push �าร��ลี�ย���ล����ี��ลั
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:151
-msgid "_Pull..."
-msgstr "_Pull..."
+msgid "_Pullâ?¦"
+msgstr "_Pullâ?¦"
 
 #. Display label
 #. short-cut
@@ -5092,8 +5183,8 @@ msgstr "�_��ม"
 #: ../plugins/git/plugin.c:175 ../plugins/git/plugin.c:375
 #: ../plugins/git/plugin.c:591 ../plugins/subversion/plugin.c:60
 #: ../plugins/subversion/plugin.c:175
-msgid "_Add..."
-msgstr "�_�ิ�ม..."
+msgid "_Addâ?¦"
+msgstr "�_�ิ�ม�"
 
 #. Display label
 #. short-cut
@@ -5105,8 +5196,8 @@ msgstr "��ิ�ม���ม���า���ลั�"
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:183 ../plugins/git/plugin.c:599
 #: ../plugins/subversion/plugin.c:68 ../plugins/subversion/plugin.c:183
-msgid "_Remove..."
-msgstr "_ล�..."
+msgid "_Removeâ?¦"
+msgstr "�_อาออ��"
 
 #. Display label
 #. short-cut
@@ -5117,8 +5208,8 @@ msgstr "ล����มออ��า��ลั�"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:191
-msgid "_Ignore..."
-msgstr "_ละ�ลย..."
+msgid "_Ignoreâ?¦"
+msgstr "_ละ�ลย�"
 
 #. Display label
 #. short-cut
@@ -5129,8 +5220,8 @@ msgstr "ละ�ลย���ม"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:199
-msgid "_Check out files..."
-msgstr "_Check out ���ม..."
+msgid "_Check out filesâ?¦"
+msgstr "_Check out ���ม�"
 
 #. Display label
 #. short-cut
@@ -5141,8 +5232,8 @@ msgstr "�รีย��ื��าร��ลี�ย���ล���
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:207
-msgid "_Unstage files..."
-msgstr "_Unstage ���ม..."
+msgid "_Unstage filesâ?¦"
+msgstr "_Unstage ���ม�"
 
 #. Display label
 #. short-cut
@@ -5153,8 +5244,8 @@ msgstr "ล����มออ��า��ั��ี commit"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:215
-msgid "_Resolve conflicts..."
-msgstr "�_����อ�ั��ย��..."
+msgid "_Resolve conflictsâ?¦"
+msgstr "�_����อ�ั��ย���"
 
 #. Display label
 #. short-cut
@@ -5171,8 +5262,8 @@ msgstr "�����"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:231
-msgid "Create patch series..."
-msgstr "สร�า��ุ�ลำ�ั������..."
+msgid "Create patch seriesâ?¦"
+msgstr "สร�า��ุ�ลำ�ั�������"
 
 #. Display label
 #. short-cut
@@ -5183,8 +5274,8 @@ msgstr "สร�า����ม�����สำหรั�ส���
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:247
-msgid "_Apply..."
-msgstr "�_ริ�ม���..."
+msgid "_Applyâ?¦"
+msgstr "�_ริ�ม����"
 
 #. Display label
 #. short-cut
@@ -5239,8 +5330,8 @@ msgstr "�_���"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:287 ../plugins/git/plugin.c:507
-msgid "_Create branch..."
-msgstr "_สร�า�����..."
+msgid "_Create branchâ?¦"
+msgstr "_สร�า������"
 
 #. Display label
 #. short-cut
@@ -5251,8 +5342,8 @@ msgstr "สร�า�����"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:295
-msgid "_Delete branch..."
-msgstr "_ล�����..."
+msgid "_Delete branchâ?¦"
+msgstr "_ล������"
 
 #. Display label
 #. short-cut
@@ -5263,8 +5354,8 @@ msgstr "ล�����"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:303
-msgid "_Switch to another branch..."
-msgstr "_สลั�������อื��..."
+msgid "_Switch to another branchâ?¦"
+msgstr "_สลั����ี�����อื���"
 
 #. Display label
 #. short-cut
@@ -5275,8 +5366,8 @@ msgstr "สลั����ี�����อื��"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:311
-msgid "_Merge..."
-msgstr "_�สา�..."
+msgid "_Mergeâ?¦"
+msgstr "_�สา��"
 
 #. Display label
 #. short-cut
@@ -5299,8 +5390,8 @@ msgstr "�สา��าร��ลี�ย���ล��อ��ุ�
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:327 ../plugins/git/plugin.c:447
-msgid "_Start..."
-msgstr "_�ริ�ม..."
+msgid "_Startâ?¦"
+msgstr "_�ริ�ม�"
 
 # msgid "Start Debugger"
 #. Display label
@@ -5343,15 +5434,14 @@ msgstr "�ลิ��าร rebase �ละย�อ��ลั��ลั
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:359 ../plugins/git/plugin.c:539
-msgid "_Cherry pick..."
-msgstr "�_�����ี�ยว..."
+msgid "_Cherry pickâ?¦"
+msgstr "�_�����ี�ยว�"
 
 #. Display label
 #. short-cut
 #: ../plugins/git/plugin.c:361
 msgid ""
-"Selectively merge individual changes from other branches into the current "
-"one"
+"Selectively merge individual changes from other branches into the current one"
 msgstr "�ลือ��สา��าร��ลี�ย���ล��ีละราย�าร�า�����อื�����า�������ั��ุ�ั�"
 
 #. Action name
@@ -5369,8 +5459,8 @@ msgstr "��ิ�ม�����ี��ม���าย"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:383
-msgid "_Delete..."
-msgstr "_ล�..."
+msgid "_Deleteâ?¦"
+msgstr "_ล��"
 
 #. Display label
 #. short-cut
@@ -5380,15 +5470,9 @@ msgstr "ล������ี��ม���าย"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/git/plugin.c:391
-msgid "Tags"
-msgstr "����"
-
-#. Action name
-#. Stock icon, if any
 #: ../plugins/git/plugin.c:399 ../plugins/git/plugin.c:515
-msgid "_Create tag..."
-msgstr "สร�า��_���..."
+msgid "_Create tagâ?¦"
+msgstr "สร�า��_����"
 
 #. Display label
 #. short-cut
@@ -5399,8 +5483,8 @@ msgstr "สร�า�����"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:407
-msgid "_Delete tag..."
-msgstr "_ล�����..."
+msgid "_Delete tagâ?¦"
+msgstr "_ล������"
 
 #. Display label
 #. short-cut
@@ -5417,8 +5501,8 @@ msgstr "_ล�า���า/�ื��ลั�"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:423 ../plugins/git/plugin.c:523
-msgid "_Reset tree..."
-msgstr "_ล�า���อมูล tree..."
+msgid "_Reset treeâ?¦"
+msgstr "_ล�า���อมูล tree�"
 
 #. Display label
 #. short-cut
@@ -5429,8 +5513,8 @@ msgstr "ล�า���อมูล head �อ��ลั��ลั�ส
 #. Action name
 #. Stock icon, if any
 #: ../plugins/git/plugin.c:431 ../plugins/git/plugin.c:531
-msgid "_Revert commit..."
-msgstr "�_รีย� commit �ื�..."
+msgid "_Revert commitâ?¦"
+msgstr "�_รีย� commit �ื��"
 
 #. Display label
 #. short-cut
@@ -5635,12 +5719,12 @@ msgstr "��ื�อม�ย�"
 msgid "Automatically add resources"
 msgstr "��ิ�ม�รั�ยา�ร��ยอั���มั�ิ"
 
-#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:763
-#: ../plugins/glade/plugin.c:3094
+#: ../plugins/glade/anjuta-glade.glade.h:7 ../plugins/glade/plugin.c:764
+#: ../plugins/glade/plugin.c:3095
 msgid "Designer"
 msgstr "��รื�อ�มือออ����"
 
-#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3096
+#: ../plugins/glade/anjuta-glade.glade.h:8 ../plugins/glade/plugin.c:3097
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:3
 msgid "Editor"
 msgstr "��รื�อ�มือ�����"
@@ -5695,229 +5779,229 @@ msgstr "��า�ุ�สม�ั�ิ %s �ม��ู���อ�"
 msgid "Association item filename has no path"
 msgstr "�ื�อ���ม�อ�ราย�าร�าร��ื�อม�ย��ม�มี�า�"
 
-#: ../plugins/glade/plugin.c:855
+#: ../plugins/glade/plugin.c:856
 #, c-format
-msgid "No associations initialized, nothing to save"
+msgid "No associations initialized: nothing to save"
 msgstr "�ม�มี�าร�ำห����า�ริ�ม����าร��ื�อม�ย� �ึ��ม�มีอะ�ร�ะ�ั��ึ�"
 
-#: ../plugins/glade/plugin.c:862
+#: ../plugins/glade/plugin.c:863
 #, c-format
 msgid "Couldn't save associations because project root isn't set"
 msgstr "�ม�สามาร��ั��ึ��าร��ื�อม�ย� ��ื�อ��า��ม�����ำห��รา��อ���ร��าร"
 
-#: ../plugins/glade/plugin.c:884
+#: ../plugins/glade/plugin.c:885
 #, c-format
 msgid "Failed to save associations"
 msgstr "�ั��ึ��าร��ื�อม�ย��ม�สำ�ร��"
 
 #. iptCurrent:
-#: ../plugins/glade/plugin.c:1196
+#: ../plugins/glade/plugin.c:1197
 msgid "Current"
 msgstr "�ั��ุ�ั�"
 
 #. iptBeforeEnd:
-#: ../plugins/glade/plugin.c:1197
+#: ../plugins/glade/plugin.c:1198
 msgid "Before end"
 msgstr "��อ���ายสุ�"
 
 #. iptAfterBegin:
-#: ../plugins/glade/plugin.c:1198
+#: ../plugins/glade/plugin.c:1199
 msgid "After begin"
 msgstr "หลั��ุ��ริ�ม���"
 
 #. ipEOF:
-#: ../plugins/glade/plugin.c:1199
+#: ../plugins/glade/plugin.c:1200
 msgid "End of file"
 msgstr "��าย���ม"
 
-#: ../plugins/glade/plugin.c:1368
+#: ../plugins/glade/plugin.c:1369
 #, c-format
 msgid "Couldn't introspect the signal"
 msgstr "�ม�สามาร����าสั����สั��า����"
 
-#: ../plugins/glade/plugin.c:1390
+#: ../plugins/glade/plugin.c:1391
 #, c-format
 msgid "Python language isn't supported yet"
 msgstr "ยั��ม�รอ�รั�ภาษา���อ�"
 
-#: ../plugins/glade/plugin.c:1403
+#: ../plugins/glade/plugin.c:1404
 #, c-format
 msgid "Vala language isn't supported yet"
 msgstr "ยั��ม�รอ�รั�ภาษา Vala"
 
-#: ../plugins/glade/plugin.c:1962
+#: ../plugins/glade/plugin.c:1963
 #, c-format
 msgid "There is no associated editor for the designer"
 msgstr "�ม�มี��รื�อ�มือ������ี���ื�อม�ย��ั���รื�อ�มือออ�����ี�"
 
-#: ../plugins/glade/plugin.c:1980
+#: ../plugins/glade/plugin.c:1981
 #, c-format
-msgid "Unknown language of the editor \"%s\""
+msgid "Unknown editor language \"%s\""
 msgstr "�ม��รา�ภาษา�อ���รื�อ�มือ����� \"%s\""
 
-#: ../plugins/glade/plugin.c:2047 ../plugins/glade/plugin.c:2124
-#: ../plugins/glade/plugin.c:2249
+#: ../plugins/glade/plugin.c:2048 ../plugins/glade/plugin.c:2125
+#: ../plugins/glade/plugin.c:2250
 #, c-format
 msgid "Error while adding a new handler stub: %s"
 msgstr "��ิ���อ�ิ��ลา���ะ��ิ�ม���า��ร� handler �หม�: %s"
 
-#: ../plugins/glade/plugin.c:2054 ../plugins/glade/plugin.c:2138
-msgid "Couldn't find a signal information"
+#: ../plugins/glade/plugin.c:2055 ../plugins/glade/plugin.c:2139
+msgid "Couldn't find signal information"
 msgstr "หา��อมูล�อ�สั��า��ม���"
 
-#: ../plugins/glade/plugin.c:2081
+#: ../plugins/glade/plugin.c:2082
 msgid "Error while adding a new handler stub: No current editor"
 msgstr "��ิ���อ�ิ��ลา���ะ��ิ�ม���า��ร� handler �หม�: �ม�มี��รื�อ�มือ������ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:2254
+#: ../plugins/glade/plugin.c:2255
 #, c-format
 msgid ""
 "To avoid this message turn off \"%s\" flag in Preferences->Glade GUI Designer"
 msgstr "�ารหลี��ลี�ย���อ�วาม�ี� �ำ�����ย�ิ� \"%s\" �� �รั�����->��รื�อ�มือออ���� GUI Glade"
 
-#: ../plugins/glade/plugin.c:2324
+#: ../plugins/glade/plugin.c:2325
 msgid "Couldn't find an associated document"
 msgstr "หา�อ�สาร�ี���ื�อม�ย��ม���"
 
-#: ../plugins/glade/plugin.c:2390
+#: ../plugins/glade/plugin.c:2391
 msgid "Those documents are already associated"
 msgstr "�อ�สาร�หล�า�ั�������ื�อม�ย��ั��ล�ว"
 
-#: ../plugins/glade/plugin.c:2428
+#: ../plugins/glade/plugin.c:2429
 #, c-format
 msgid "Unable to read file: %s."
 msgstr "�ม�สามาร�อ�า����ม: %s"
 
-#: ../plugins/glade/plugin.c:3095
+#: ../plugins/glade/plugin.c:3096
 msgid "Top level widget"
 msgstr "วิ�����ระ�ั���สุ�"
 
-#: ../plugins/glade/plugin.c:3686
+#: ../plugins/glade/plugin.c:3687
 msgid "Couldn't find a default signal name"
 msgstr "หา�ื�อสั��า��ริยาย�ม���"
 
-#: ../plugins/glade/plugin.c:3896
+#: ../plugins/glade/plugin.c:3897
 #, c-format
 msgid "Project %s has no deprecated widgets or version mismatches."
 msgstr "��ร��าร %s �ม�มีวิ������ี��ม���ะ�ำ�ห���� �ละ�ม�มี�ั�หารุ���ม��ร��ั�"
 
-#: ../plugins/glade/plugin.c:3913
+#: ../plugins/glade/plugin.c:3914
 msgid "There is no Glade project"
 msgstr "�ม�มี��ร��าร Glade"
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/glade/plugin.c:3999
+#: ../plugins/glade/plugin.c:4000
 msgid "_Glade"
 msgstr "_Glade"
 
-#: ../plugins/glade/plugin.c:4007 ../plugins/glade/plugin.c:4009
+#: ../plugins/glade/plugin.c:4008 ../plugins/glade/plugin.c:4010
 msgid "Switch between designer/code"
 msgstr "สลั�ระหว�า���รื�อ�มือออ����/����"
 
-#: ../plugins/glade/plugin.c:4015 ../plugins/glade/plugin.c:4017
+#: ../plugins/glade/plugin.c:4016 ../plugins/glade/plugin.c:4018
 msgid "Insert handler stub"
 msgstr "��ร����า��ร� handler"
 
-#: ../plugins/glade/plugin.c:4023 ../plugins/glade/plugin.c:4025
+#: ../plugins/glade/plugin.c:4024 ../plugins/glade/plugin.c:4026
 msgid "Insert handler stub, autoposition"
 msgstr "��ร����า��ร� handler, �ั��ำ�ห���อั���มั�ิ"
 
-#: ../plugins/glade/plugin.c:4031
+#: ../plugins/glade/plugin.c:4032
 msgid "Associate last designer and last editor"
 msgstr "��ื�อม�ย����มล�าสุ�����รื�อ�มือออ��ละ��รื�อ�มือ��������า��วย�ั�"
 
-#: ../plugins/glade/plugin.c:4033
+#: ../plugins/glade/plugin.c:4034
 msgid "Associate last designer and editor"
 msgstr "��ื�อม�ย����มล�าสุ�����รื�อ�มือออ��ละ��รื�อ�มือ��������า��วย�ั�"
 
-#: ../plugins/glade/plugin.c:4039 ../plugins/glade/plugin.c:4041
-msgid "Associations dialog..."
-msgstr "�ล�อ�����อ��าร��ื�อม�ย�..."
+#: ../plugins/glade/plugin.c:4040 ../plugins/glade/plugin.c:4042
+msgid "Associations dialogâ?¦"
+msgstr "�ล�อ�����อ��าร��ื�อม�ย��"
 
-#: ../plugins/glade/plugin.c:4047
-msgid "Versioning..."
-msgstr "�าร�ั��ารรุ��..."
+#: ../plugins/glade/plugin.c:4048
+msgid "Versioningâ?¦"
+msgstr "�าร�ั��ารรุ���"
 
-#: ../plugins/glade/plugin.c:4049
+#: ../plugins/glade/plugin.c:4050
 msgid "Switch between library versions and check deprecations"
 msgstr "สลั�ระหว�า�รุ����า�� �อ��ล�รารี �ละ�รว�สอ��าร����ั����ั��ี��ม���ะ�ำ�ห����"
 
-#: ../plugins/glade/plugin.c:4055 ../plugins/glade/plugin.c:4057
+#: ../plugins/glade/plugin.c:4056 ../plugins/glade/plugin.c:4058
 msgid "Set as default resource target"
 msgstr "�ำห���������าหมาย�รั�ยา�ร�ริยาย"
 
-#: ../plugins/glade/plugin.c:4065
+#: ../plugins/glade/plugin.c:4066
 msgid "Current default target"
 msgstr "���าหมาย�ริยาย�ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:4073
+#: ../plugins/glade/plugin.c:4074
 msgid "Close the current file"
 msgstr "�ิ����ม�ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:4081
+#: ../plugins/glade/plugin.c:4082
 msgid "Save the current file"
 msgstr "�ั��ึ����ม�ั��ุ�ั�"
 
-#: ../plugins/glade/plugin.c:4097
+#: ../plugins/glade/plugin.c:4098
 msgid "Redo the last action"
 msgstr "�ำ��ำ��ิ�ั�ิ�ารล�าสุ�"
 
-#: ../plugins/glade/plugin.c:4105
+#: ../plugins/glade/plugin.c:4106
 msgid "Cut the selection"
 msgstr "�ั�สิ���ี��ลือ�"
 
-#: ../plugins/glade/plugin.c:4113
+#: ../plugins/glade/plugin.c:4114
 msgid "Copy the selection"
 msgstr "�ั�ลอ�สิ���ี��ลือ�"
 
-#: ../plugins/glade/plugin.c:4121
+#: ../plugins/glade/plugin.c:4122
 msgid "Paste the clipboard"
 msgstr "��ะ��ื�อหา�า��ลิ��อร��"
 
-#: ../plugins/glade/plugin.c:4129
+#: ../plugins/glade/plugin.c:4130
 msgid "Delete the selection"
 msgstr "ล�สิ���ี��ลือ�"
 
-#: ../plugins/glade/plugin.c:4307
+#: ../plugins/glade/plugin.c:4308
 msgid "Glade designer operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���รื�อ�มือออ���� Glade"
 
-#: ../plugins/glade/plugin.c:4407
+#: ../plugins/glade/plugin.c:4408
 msgid "Go back in undo history"
 msgstr "ย�อ��ลั����ระวั�ิ�าร�รีย��ื�"
 
-#: ../plugins/glade/plugin.c:4409
+#: ../plugins/glade/plugin.c:4410
 msgid "Go forward in undo history"
 msgstr "����า�ห��า���ระวั�ิ�าร�รีย��ื�"
 
-#: ../plugins/glade/plugin.c:4431
+#: ../plugins/glade/plugin.c:4432
 msgid "Glade Clipboard"
 msgstr "�ลิ��อร�� Glade"
 
-#: ../plugins/glade/plugin.c:4436
+#: ../plugins/glade/plugin.c:4437
 msgid "Widgets"
 msgstr "วิ�����"
 
-#: ../plugins/glade/plugin.c:4441
+#: ../plugins/glade/plugin.c:4442
 msgid "Palette"
 msgstr "�ล�อ���รื�อ�มือ"
 
-#: ../plugins/glade/plugin.c:4695
+#: ../plugins/glade/plugin.c:4696
 #, c-format
 msgid "Not local file: %s"
 msgstr "�ม�������ม����รื�อ�: %s"
 
-#: ../plugins/glade/plugin.c:4716
+#: ../plugins/glade/plugin.c:4717
 #, c-format
 msgid "Could not open %s"
 msgstr "��ิ� %s �ม����"
 
-#: ../plugins/glade/plugin.c:4767
+#: ../plugins/glade/plugin.c:4768
 msgid "Could not create a new glade project."
 msgstr "สร�า���ร��าร glade ��ร��าร�หม��ม����"
 
-#: ../plugins/glade/plugin.c:5029 ../plugins/glade/plugin.c:5054
+#: ../plugins/glade/plugin.c:5030 ../plugins/glade/plugin.c:5055
 msgid "Glade GUI Designer"
 msgstr "��รื�อ�มือออ���� GUI Glade"
 
@@ -5929,8 +6013,8 @@ msgstr "�ั��ึ���ร��าร glade '%s' �ล�ว"
 
 #: ../plugins/glade/anjuta-design-document.c:379
 #: ../plugins/glade/anjuta-design-document.c:406
-msgid "Invalid glade file name"
-msgstr "�ื�อ���ม glade �ม��ู���อ�"
+msgid "Invalid Glade file name"
+msgstr "�ื�อ���ม Glade �ม��ู���อ�"
 
 #: ../plugins/gtodo/add_edit_item.c:99
 msgid "You need to select a to do item before you can edit it"
@@ -5950,7 +6034,7 @@ msgid "Summary:"
 msgstr "สรุ�:"
 
 #. option menu label
-#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:4
+#: ../plugins/gtodo/add_edit_item.c:172 ../plugins/macro/anjuta-macro.ui.h:1
 msgid "Category:"
 msgstr "�ระ�ภ�:"
 
@@ -5991,7 +6075,7 @@ msgstr "�ริ�ม���:"
 #: ../plugins/gtodo/add_edit_item.c:289 ../plugins/gtodo/add_edit_item.c:296
 #: ../plugins/gtodo/add_edit_item.c:332 ../plugins/gtodo/add_edit_item.c:333
 #, c-format
-msgid "n/a"
+msgid "N/A"
 msgstr "�ม�มี��อมูล"
 
 #: ../plugins/gtodo/add_edit_item.c:296 ../plugins/gtodo/add_edit_item.c:339
@@ -6000,27 +6084,23 @@ msgid "stopped:"
 msgstr "หยุ�:"
 
 #: ../plugins/gtodo/callback.c:17
-msgid "You need to select a todo item before you can remove it"
+msgid "You need to select a to-do item before you can remove it"
 msgstr "�ุ���อ��ลือ�ราย�าร todo ��อ��ะสั��ล�"
 
 #: ../plugins/gtodo/callback.c:20
-msgid "Are you sure you want to remove the selected todo item?"
+msgid "Are you sure you want to remove the selected to-do item?"
 msgstr "ยื�ยั�หรือ�ม�ว�า��อ��ารล�ราย�าร todo �ี��ลือ�?"
 
-#: ../plugins/gtodo/callback.c:20 ../plugins/gtodo/callback.c:101
-msgid "Remove"
-msgstr "ล�"
-
 #: ../plugins/gtodo/callback.c:98
 #, c-format
-msgid "Are you sure you want to remove all the completed todo items?"
+msgid "Are you sure you want to remove all the completed to-do items?"
 msgstr "ยื�ยั�ว�า��อ��ารล�ราย�าร todo �ั��หม��ี��สร��สิ���ล�วหรือ�ม�?"
 
 #: ../plugins/gtodo/callback.c:99
 #, c-format
 msgid ""
-"Are you sure you want to remove all the completed todo items in the category "
-"\"%s\"?"
+"Are you sure you want to remove all the completed to-do items in the "
+"category \"%s\"?"
 msgstr "ยื�ยั�ว�า��อ��ารล�ราย�าร todo �ั��หม��ี��สร��สิ���ล�ว���ระ�ภ� \"%s\" หรือ�ม�?"
 
 #: ../plugins/gtodo/export.c:47
@@ -6092,7 +6172,7 @@ msgstr "อ�า����ม�ม�สำ�ร��"
 
 #: ../plugins/gtodo/libgtodo.c:626 ../plugins/gtodo/libgtodo.c:637
 #, c-format
-msgid "Failed to parse xml structure"
+msgid "Failed to parse XML structure"
 msgstr "�����ร�สร�า� XML �ม�สำ�ร��"
 
 #: ../plugins/gtodo/libgtodo.c:646
@@ -6149,18 +6229,18 @@ msgstr "ล�"
 msgid "<New category (%d)>"
 msgstr "<�ระ�ภ��หม� (%d)>"
 
-#: ../plugins/gtodo/notification.c:67
+#: ../plugins/gtodo/notification.c:68
 #, c-format
 msgid "The following item is due in %i minute:"
 msgid_plural "The following item is due in %i minutes:"
 msgstr[0] "ราย�าร��อ���ี��ะ�ึ��ำห���� %i �า�ี:"
 
-#: ../plugins/gtodo/notification.c:76
+#: ../plugins/gtodo/notification.c:77
 msgid "The following item is due:"
 msgstr "ราย�าร��อ���ี��ึ��ำห���ล�ว:"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(hbox), 9);
-#: ../plugins/gtodo/notification.c:116
+#: ../plugins/gtodo/notification.c:118
 msgid "_Do not show again"
 msgstr "�_ม���อ��ส��อี�"
 
@@ -6173,7 +6253,7 @@ msgid "Hide _Completed Items"
 msgstr "��อ�_ราย�าร�ี��สร��สิ���ล�ว"
 
 #: ../plugins/gtodo/plugin.c:76
-msgid "Hide completed todo items"
+msgid "Hide completed to-do items"
 msgstr "��อ�ราย�าร todo �ี��สร��สิ���ล�ว"
 
 #: ../plugins/gtodo/plugin.c:83
@@ -6193,11 +6273,11 @@ msgid "Hide items without an end date"
 msgstr "��อ�ราย�าร�ี��ม��ำห��วั��สร��"
 
 #: ../plugins/gtodo/plugin.c:122
-msgid "Tasks manager"
+msgid "Task manager"
 msgstr "��รื�อ�มือ�ั��ารภาร�ิ�"
 
 #: ../plugins/gtodo/plugin.c:128
-msgid "Tasks manager view"
+msgid "Task manager view"
 msgstr "มุมมอ���รื�อ�มือ�ั��ารภาร�ิ�"
 
 #: ../plugins/gtodo/plugin.c:134
@@ -6205,11 +6285,11 @@ msgid "Tasks"
 msgstr "ภาร�ิ�"
 
 #: ../plugins/gtodo/plugin.c:342 ../plugins/gtodo/plugin.c:351
-msgid "Todo Manager"
+msgid "To-do Manager"
 msgstr "��รื�อ�มือ�ั��าร Todo"
 
 #: ../plugins/gtodo/preferences.c:21
-msgid "Todo List Preferences"
+msgid "To-do List Preferences"
 msgstr "�าร�รั�����ราย�าร Todo"
 
 #: ../plugins/gtodo/preferences.c:84
@@ -6258,11 +6338,11 @@ msgid_plural "Items that are due in the next %i days"
 msgstr[0] "ราย�าร�ี��ึ��ำห���� %i วั���า�ห��า"
 
 #: ../plugins/gtodo/preferences.c:168
-msgid "Misc"
+msgid "Miscellaneous"
 msgstr "อื���"
 
 #: ../plugins/gtodo/preferences.c:171
-msgid "Auto purge completed items"
+msgid "Auto-purge completed items"
 msgstr "ล�า�ราย�าร�ี��สร��สิ���ล�ว��ยอั���มั�ิ"
 
 #. Translators: First part of the sentence "Purge items after %d days"
@@ -6276,7 +6356,7 @@ msgid "days."
 msgstr "วั�"
 
 #: ../plugins/gtodo/preferences.c:195 ../plugins/gtodo/preferences.c:197
-msgid "Auto Purge"
+msgid "Auto-Purge"
 msgstr "ล�า�อั���มั�ิ"
 
 #: ../plugins/gtodo/preferences.c:209 ../plugins/gtodo/preferences.c:211
@@ -6285,8 +6365,8 @@ msgstr "�าร������ือ�"
 
 #: ../plugins/gtodo/preferences.c:218
 #, c-format
-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"
+msgid "Allow to-do items to notify me when they are due in %i minute"
+msgid_plural "Allow to-do items to notify me when they are due in %i minutes"
 msgstr[0] "�ห�������ือ�ราย�าร todo �มื�อ�ะ�ึ��ำห���� %i �า�ี"
 
 #: ../plugins/gtodo/tasklists.c:10
@@ -6301,29 +6381,29 @@ msgstr "สร�า�ราย�ารภาร�ิ�"
 msgid "No Date"
 msgstr "�ม�มีวั��ี�"
 
-#: ../plugins/macro/anjuta-macro.ui.h:1
-msgid "<b>Macro details:</b>"
-msgstr "<b>รายละ�อีย��ม��ร:</b>"
-
 #: ../plugins/macro/anjuta-macro.ui.h:2
-msgid "<b>Macro text:</b>"
-msgstr "<b>��อ�วาม�ม��ร:</b>"
+msgid "Edit&#x2026;"
+msgstr "�����&#x2026;"
 
 #: ../plugins/macro/anjuta-macro.ui.h:3
-msgid "<b>Macros:</b>"
-msgstr "<b>�ม��ร:</b>"
+msgid "Macro details:"
+msgstr "รายละ�อีย��ม��ร:"
+
+#: ../plugins/macro/anjuta-macro.ui.h:4
+msgid "Macro text:"
+msgstr "��อ�วาม�ม��ร:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:5
-msgid "Edit..."
-msgstr "�����..."
+msgid "Macros:"
+msgstr "�ม��ร:"
 
 #: ../plugins/macro/anjuta-macro.ui.h:7
 msgid "Shortcut:"
 msgstr "�ุ�มลั�:"
 
 #: ../plugins/macro/macro-actions.c:127
-msgid "Press macro shortcut..."
-msgstr "���ุ�มลั��ม��ร..."
+msgid "Press macro shortcutâ?¦"
+msgstr "���ุ�มลั��ม��ร�"
 
 #: ../plugins/macro/macro-actions.c:134
 msgid "Press shortcut"
@@ -6348,15 +6428,15 @@ msgstr ""
 "�ระ�ภ�:\t %s\n"
 "�ุ�มลั�:\t %c\n"
 
-#: ../plugins/macro/macro-dialog.c:276
+#: ../plugins/macro/macro-dialog.c:277
 msgid "Insert"
 msgstr "��ร�"
 
-#: ../plugins/macro/macro-dialog.c:279
+#: ../plugins/macro/macro-dialog.c:280
 msgid "Insert macro"
 msgstr "��ร��ม��ร"
 
-#: ../plugins/macro/macro-edit.c:211
+#: ../plugins/macro/macro-edit.c:207
 msgid "Add/Edit macro"
 msgstr "��ิ�ม/������ม��ร"
 
@@ -6375,24 +6455,24 @@ msgid "Macros"
 msgstr "�ม��ร"
 
 #: ../plugins/macro/plugin.c:42
-msgid "_Insert Macro..."
-msgstr "�_�ร��ม��ร..."
+msgid "_Insert Macroâ?¦"
+msgstr "�_�ร��ม��ร�"
 
 #: ../plugins/macro/plugin.c:44
 msgid "Insert a macro using a shortcut"
 msgstr "��ร��ม��ร��ย����ุ�มลั�"
 
 #: ../plugins/macro/plugin.c:49
-msgid "_Add Macro..."
-msgstr "�_�ิ�ม�ม��ร..."
+msgid "_Add Macroâ?¦"
+msgstr "�_�ิ�ม�ม��ร�"
 
 #: ../plugins/macro/plugin.c:51
 msgid "Add a macro"
 msgstr "��ิ�ม�ม��ร"
 
 #: ../plugins/macro/plugin.c:56
-msgid "Macros..."
-msgstr "�ม��ร..."
+msgid "Macrosâ?¦"
+msgstr "�ม��ร�"
 
 #: ../plugins/macro/plugin.c:58
 msgid "Add/Edit/Remove macros"
@@ -6402,71 +6482,76 @@ msgstr "��ิ�ม/�����/ล��ม��ร"
 msgid "Macro operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��ม��ร"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:1
-msgid "<b>Indicators</b>"
-msgstr "<b>�ัว����ี�</b>"
-
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:2
-msgid "<b>Message colors</b>"
-msgstr "<b>สี��อ�วาม</b>"
-
+#. text style in editor
 #: ../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.ui.h:5
 msgid "Diagonal"
 msgstr "��ว��ย�"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:4
 msgid "Error message indicator style:"
 msgstr "รู�����อ��ัว����ี��อ���อ�วาม��อ�ิ��ลา�:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:7
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:5
 msgid "Errors:"
 msgstr "��อ�ิ��ลา�:"
 
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:6
+msgid "Indicators"
+msgstr "�ัว����ี�"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:8
+msgid "Message colors"
+msgstr "สี��อ�วาม"
+
 #: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:9
+msgid "Messages options"
+msgstr "�ัว�ลือ�สำหรั���อ�วาม"
+
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
 msgid "Normal message indicator style:"
 msgstr "รู�����อ��ัว����ี��อ���อ�วาม���ิ:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:10
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
 msgid "Number of first characters to show:"
 msgstr "�ำ�ว��อ�อั��ระ�����อ�วาม�ี��ส��:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:11
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:12
 msgid "Number of last characters to show:"
 msgstr "�ำ�ว��อ�อั��ระ��าย��อ�วาม�ี��ส��:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:13
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:15
 msgid "Strike-Out"
 msgstr "�ี���า"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:14
-msgid "Tabs position:"
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+msgid "Tab position:"
 msgstr "�ำ�ห�������:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:16
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
 msgid "Truncate long messages"
 msgstr "�ั���อ�วาม�ี�ยาว"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:17
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
 msgid "Underline-Plain"
 msgstr "�ี��ส�����-�รรม�า"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:18
+#. text style in editor
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:22
 msgid "Underline-Squiggle"
 msgstr "�ี��ส�����-�ส��หยั�"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:19
+#. text style in editor, TT is for typewriter text
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:24
 msgid "Underline-TT"
 msgstr "�ี��ส�����-TT"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:20
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:25
 msgid "Warning message indicator style:"
 msgstr "รู�����อ��ัว����ี��อ���อ�วาม�ำ��ือ�:"
 
-#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:21
+#: ../plugins/message-view/anjuta-message-manager-plugin.ui.h:26
 msgid "Warnings:"
 msgstr "�ำ��ือ�:"
 
@@ -6474,56 +6559,56 @@ msgstr "�ำ��ือ�:"
 msgid "Close all message tabs"
 msgstr "�ิ�������อ�วาม�ั��หม�"
 
-#: ../plugins/message-view/message-view.c:490
+#: ../plugins/message-view/message-view.c:491
 msgid "No Messages"
 msgstr "�ม�มี��อ�วาม"
 
-#: ../plugins/message-view/message-view.c:499
+#: ../plugins/message-view/message-view.c:500
 msgid "No Infos"
 msgstr "�ม�มี��อมูล"
 
-#: ../plugins/message-view/message-view.c:511
+#: ../plugins/message-view/message-view.c:512
 msgid "No Warnings"
 msgstr "�ม�มี�ำ��ือ�"
 
-#: ../plugins/message-view/message-view.c:524
+#: ../plugins/message-view/message-view.c:525
 msgid "No Errors"
 msgstr "�ม�มี��อ�ิ��ลา�"
 
-#: ../plugins/message-view/message-view.c:569
+#: ../plugins/message-view/message-view.c:570
 msgid "Icon"
 msgstr "�อ�อ�"
 
-#: ../plugins/message-view/message-view.c:583
+#: ../plugins/message-view/message-view.c:584
 #: ../plugins/message-view/plugin.c:324 ../plugins/message-view/plugin.c:333
 #: ../plugins/message-view/plugin.c:453 ../plugins/message-view/plugin.c:465
 msgid "Messages"
 msgstr "��อ�วาม"
 
-#: ../plugins/message-view/message-view.c:942
+#: ../plugins/message-view/message-view.c:943
 #, c-format
 msgid "Error writing %s"
 msgstr "��ิ���อ�ิ��ลา���ะ��ีย� %s"
 
-#: ../plugins/message-view/message-view.c:1099
+#: ../plugins/message-view/message-view.c:1100
 #, c-format
 msgid "%d Message"
 msgid_plural "%d Messages"
 msgstr[0] "%d ��อ�วาม"
 
-#: ../plugins/message-view/message-view.c:1105
+#: ../plugins/message-view/message-view.c:1106
 #, c-format
 msgid "%d Info"
 msgid_plural "%d Infos"
 msgstr[0] "%d ��อมูล"
 
-#: ../plugins/message-view/message-view.c:1110
+#: ../plugins/message-view/message-view.c:1111
 #, c-format
 msgid "%d Warning"
 msgid_plural "%d Warnings"
 msgstr[0] "%d �ำ��ือ�"
 
-#: ../plugins/message-view/message-view.c:1115
+#: ../plugins/message-view/message-view.c:1116
 #, c-format
 msgid "%d Error"
 msgid_plural "%d Errors"
@@ -6587,16 +6672,16 @@ msgid "Patching %s using %s\n"
 msgstr "�ำลั������ %s ��ย��� %s\n"
 
 #: ../plugins/patch/patch-plugin.c:209
-msgid "Patching...\n"
-msgstr "�ำลั������...\n"
+msgid "Patchingâ?¦\n"
+msgstr "�ำลั�������\n"
 
 #: ../plugins/patch/patch-plugin.c:219
-msgid "Patching..."
-msgstr "�ำลั������..."
+msgid "Patchingâ?¦"
+msgstr "�ำลั�������"
 
 #: ../plugins/patch/patch-plugin.c:224
-msgid "There are unfinished jobs, please wait until they are finished."
-msgstr "มี�า��ี�ยั��ม��สร�� �รุ�ารอ���ว�า�ะ�สร���รีย�ร�อย"
+msgid "There are unfinished jobs: please wait until they are finished."
+msgstr "มี�า��ี�ยั��ม��สร�� �รุ�ารอ���ว�า�า��ะ�สร���รีย�ร�อย"
 
 #: ../plugins/patch/patch-plugin.c:266
 msgid ""
@@ -6638,77 +6723,82 @@ msgstr "�_�รื�อ�มือ"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/patch/plugin.c:61
-msgid "_Patch..."
-msgstr "�_����..."
+msgid "_Patchâ?¦"
+msgstr "�_�����"
 
 #: ../plugins/patch/plugin.c:92
 msgid "Patch files/directories"
 msgstr "��������ม/���ร��อรี"
 
-#: ../plugins/project-import/plugin.c:66
+#: ../plugins/project-import/plugin.c:68
 msgid ""
 "Generation of project file failed. Cannot find an appropriate project "
-"template to use. Please make sure your version of Anjuta is up to date."
+"template to use. Please make sure your version of Anjuta is up-to-date."
 msgstr ""
 "สร�า����ม��ร��าร�ม�สำ�ร�� �ม�สามาร�หา�ม������ร��าร�ี��ะ������ "
 "�รุ�า�รว�สอ��ห������ว�ารุ���อ��อ��ู�า����รุ���หม��อ"
 
-#: ../plugins/project-import/plugin.c:86
+#: ../plugins/project-import/plugin.c:88
 #, c-format
 msgid "A file named \"%s\" already exists. Do you want to replace it?"
 msgstr "มี���ม�ื�อ \"%s\" อยู��ล�ว ��อ��าร����ี�หรือ�ม�?"
 
-#: ../plugins/project-import/plugin.c:134
+#: ../plugins/project-import/plugin.c:136
 #, c-format
 msgid ""
-"A file named \"%s\" cannot be written: %s.  Check if you have write access "
-"to the project directory."
+"A file named \"%s\" cannot be written: %s. Check if you have write access to "
+"the project directory."
 msgstr ""
 "���ม�ื�อ \"%s\" �ม�สามาร���ีย��ั����: %s  "
 "�รุ�า�รว�สอ�ว�า�ุ�มีสิ��ิ���ีย������ร��อรี��ร��ารหรือ�ม�"
 
-#: ../plugins/project-import/plugin.c:204
+#: ../plugins/project-import/plugin.c:200
+#, c-format
+msgid "Please select a project backend to open %s."
+msgstr "�รุ�า�ลือ������อ�����ร��าร�ี��ะ�����ิ� %s"
+
+#: ../plugins/project-import/plugin.c:220
 #, c-format
 msgid ""
-"Could not find a valid project backend for the directory given (%s). Please "
+"Could not find a valid project backend for the given directory (%s). Please "
 "select a different directory, or try upgrading to a newer version of Anjuta."
 msgstr ""
 "�ม�สามาร�หา�����อ�����ร��าร�ี��ู���อ�สำหรั����ร��อรี�ี��ห�มา (%s) �รุ�า�ลือ����ร��อรีอื�� "
 "หรือลอ��รั�รุ���อ��ู�า����รุ���หม�"
 
-#: ../plugins/project-import/plugin.c:274
-#: ../plugins/project-import/plugin.c:330
+#: ../plugins/project-import/plugin.c:290
+#: ../plugins/project-import/plugin.c:346
 #, c-format
 msgid ""
-"Couldn't checkout the supplied uri \"%s\", the error returned was: \"%s\""
-msgstr "�ม�สามาร� checkout �า� uri \"%s\" �ี��ำห�� ��อ�ิ��ลา��ี����ือ: \"%s\""
+"Couldn't check out the supplied URI \"%s\". The error returned was: \"%s\""
+msgstr "�ม�สามาร� check out �า� URI \"%s\" �ี��ำห�� ��อ�ิ��ลา��ี����ือ: \"%s\""
 
 #: ../plugins/project-import/project-import.ui.h:1
-msgid "<b>Import options</b>"
-msgstr "<b>�ัว�ลือ��าร�ำ���า</b>"
-
-#: ../plugins/project-import/project-import.ui.h:2
-msgid "<b>Project name</b>"
-msgstr "<b>�ื�อ��ร��าร</b>"
-
-#: ../plugins/project-import/project-import.ui.h:3
-#: ../plugins/project-wizard/templates/translatable-strings.h:34
+#: ../plugins/project-wizard/templates/translatable-strings.h:36
 #: ../plugins/subversion/anjuta-subversion.ui.h:9
 msgid "Destination:"
 msgstr "�ลาย�า�:"
 
-#: ../plugins/project-import/project-import.ui.h:4
+#: ../plugins/project-import/project-import.ui.h:2
 msgid "Import from folder"
 msgstr "�ำ���า�า���ล��อร�"
 
-#: ../plugins/project-import/project-import.ui.h:5
+#: ../plugins/project-import/project-import.ui.h:3
 msgid "Import from version control system"
 msgstr "�ำ���า�า�ระ���ว��ุมรุ��"
 
-#: ../plugins/project-import/project-import.ui.h:6
+#: ../plugins/project-import/project-import.ui.h:4
+msgid "Import options"
+msgstr "�ัว�ลือ��าร�ำ���า"
+
+#: ../plugins/project-import/project-import.ui.h:5
 msgid "Location:"
 msgstr "�ำ�ห���:"
 
+#: ../plugins/project-import/project-import.ui.h:6
+msgid "Project name"
+msgstr "�ื�อ��ร��าร"
+
 #: ../plugins/project-import/project-import-dialog.c:292
 msgid "Import project"
 msgstr "�ำ���า��ร��าร"
@@ -6762,130 +6852,151 @@ msgid "_Group name:"
 msgstr "�ื�อ_�ลุ�ม:"
 
 #: ../plugins/project-manager/create_dialogs.ui.h:12
-msgid "_Select file to add..."
-msgstr "�_ลือ����ม�ี��ะ��ิ�ม..."
+msgid "_Select file to addâ?¦"
+msgstr "�_ลือ����ม�ี��ะ��ิ�ม�"
 
-#: ../plugins/project-manager/gbf-project-model.c:233
-#: ../plugins/project-manager/plugin.c:1301
-#: ../plugins/project-manager/plugin.c:1384
-#: ../plugins/project-manager/plugin.c:1557
+#: ../plugins/project-manager/gbf-project-model.c:250
+#: ../plugins/project-manager/plugin.c:1420
+#: ../plugins/project-manager/plugin.c:1503
+#: ../plugins/project-manager/plugin.c:1679
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:1
 msgid "Project"
 msgstr "��ร��าร"
 
-#: ../plugins/project-manager/gbf-project-model.c:234
+#: ../plugins/project-manager/gbf-project-model.c:251
 msgid "GbfProject Object"
 msgstr "อ�อ������ GbfProject"
 
-#: ../plugins/project-manager/gbf-project-model.c:251
+#: ../plugins/project-manager/gbf-project-model.c:696
 msgid "No project loaded"
 msgstr "�ม�มี�าร�หล���ร��าร"
 
+#: ../plugins/project-manager/gbf-project-util.c:229
 #: ../plugins/project-manager/gbf-project-util.c:236
-#: ../plugins/project-manager/gbf-project-util.c:244
-msgid "Can not add group"
+msgid "Cannot add group"
 msgstr "�ม�สามาร���ิ�ม�ลุ�ม"
 
-#: ../plugins/project-manager/gbf-project-util.c:245
+#: ../plugins/project-manager/gbf-project-util.c:237
 msgid "No parent group selected"
 msgstr "�ม�มี�าร�ลือ��ลุ�ม�ม�"
 
-#: ../plugins/project-manager/gbf-project-util.c:417
-#: ../plugins/project-manager/gbf-project-util.c:426
-msgid "Can not add target"
+#: ../plugins/project-manager/gbf-project-util.c:407
+#: ../plugins/project-manager/gbf-project-util.c:414
+msgid "Cannot add target"
 msgstr "�ม�สามาร���ิ�ม���าหมาย"
 
-#: ../plugins/project-manager/gbf-project-util.c:427
+#: ../plugins/project-manager/gbf-project-util.c:415
 msgid "No group selected"
 msgstr "�ม�มี�าร�ลือ��ลุ�ม"
 
-#: ../plugins/project-manager/gbf-project-util.c:532
-msgid "Select sources..."
-msgstr "�ลือ��อร�ส..."
+#: ../plugins/project-manager/gbf-project-util.c:510
+msgid "Select sourcesâ?¦"
+msgstr "�ลือ��อร�ส�"
 
-#: ../plugins/project-manager/gbf-project-util.c:772
-#: ../plugins/project-manager/gbf-project-util.c:779
-msgid "Can not add source files"
+#: ../plugins/project-manager/gbf-project-util.c:744
+#: ../plugins/project-manager/gbf-project-util.c:751
+msgid "Cannot add source files"
 msgstr "�ม�สามาร���ิ�ม���ม�อร�ส"
 
-#: ../plugins/project-manager/gbf-project-util.c:780
+#: ../plugins/project-manager/gbf-project-util.c:752
 msgid "No target has been selected"
 msgstr "�ม�มี�าร�ลือ����าหมาย"
 
-#: ../plugins/project-manager/plugin.c:425
-#: ../plugins/project-manager/plugin.c:826
-msgid "Project properties"
-msgstr "�ุ�สม�ั�ิ��ร��าร"
+#: ../plugins/project-manager/plugin.c:437
+msgid "Group properties"
+msgstr "�ุ�สม�ั�ิ�ลุ�ม"
+
+#: ../plugins/project-manager/plugin.c:446
+msgid "No properties available for this group"
+msgstr "�ม�มี�ุ�สม�ั�ิสำหรั��ลุ�ม�ี�"
 
-#: ../plugins/project-manager/plugin.c:430
+#: ../plugins/project-manager/plugin.c:451
 msgid "Target properties"
 msgstr "�ุ�สม�ั�ิ���าหมาย"
 
-#: ../plugins/project-manager/plugin.c:435
-msgid "Group properties"
-msgstr "�ุ�สม�ั�ิ�ลุ�ม"
-
-#: ../plugins/project-manager/plugin.c:459
+#: ../plugins/project-manager/plugin.c:460
 msgid "No properties available for this target"
 msgstr "�ม�มี��อมูล�ุ�สม�ั�ิสำหรั����าหมาย�ี�"
 
-#: ../plugins/project-manager/plugin.c:485
+#: ../plugins/project-manager/plugin.c:492
+#: ../plugins/project-manager/plugin.c:900
+msgid "Project properties"
+msgstr "�ุ�สม�ั�ิ��ร��าร"
+
+#: ../plugins/project-manager/plugin.c:511
+msgid "Refreshing symbol treeâ?¦"
+msgstr "�รีย���อมูล�อ� tree สั�ลั�ษ���หม��"
+
+#: ../plugins/project-manager/plugin.c:518
 #, c-format
 msgid "Failed to refresh project: %s"
 msgstr "�รั���อมูล��ร��าร�ม�สำ�ร��: %s"
 
-#: ../plugins/project-manager/plugin.c:663
+#: ../plugins/project-manager/plugin.c:688
 msgid ""
-"Are you sure you want to remove the following group from project?\n"
+"Are you sure you want to remove the following group from the project?\n"
 "\n"
 msgstr ""
 "ยื�ยั�ว�า��อ��ารล��ลุ�ม��อ���ี�ออ��า���ร��ารหรือ�ม�?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:664
-#, c-format
-msgid ""
-"Group: %s\n"
-"\n"
-"The group will not be deleted from file system."
-msgstr ""
-"�ลุ�ม: %s\n"
-"\n"
-"�ลุ�ม�ี��ะ�ม��ู�ล�ออ��า�ระ�����ม"
-
-#: ../plugins/project-manager/plugin.c:667
+#: ../plugins/project-manager/plugin.c:691
 msgid ""
-"Are you sure you want to remove the following target from project?\n"
+"Are you sure you want to remove the following target from the project?\n"
 "\n"
 msgstr ""
 "ยื�ยั�ว�า��อ��ารล����าหมาย��อ���ี�ออ��า���ร��ารหรือ�ม�?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:668
-#, c-format
-msgid "Target: %s"
-msgstr "���าหมาย: %s"
-
-#: ../plugins/project-manager/plugin.c:671
+#: ../plugins/project-manager/plugin.c:694
 msgid ""
-"Are you sure you want to remove the following source file from project?\n"
+"Are you sure you want to remove the following source file from the project?\n"
 "\n"
 msgstr ""
 "ยื�ยั�ว�า��อ��ารล����ม�อร�ส��อ���ี�ออ��า���ร��ารหรือ�ม�?\n"
 "\n"
 
-#: ../plugins/project-manager/plugin.c:672
-#, c-format
+#: ../plugins/project-manager/plugin.c:697
 msgid ""
-"Source: %s\n"
+"Are you sure you want to remove the following elements from the project?\n"
 "\n"
-"The source file will not be deleted from file system."
 msgstr ""
-"�อร�ส: %s\n"
+"ยื�ยั�ว�า��อ��ารล�อ����ระ�อ���อ���ี�ออ��า���ร��ารหรือ�ม�?\n"
 "\n"
-"���ม�อร�ส�ะ�ม��ู�ล�ออ��า�ระ�����ม"
 
-#: ../plugins/project-manager/plugin.c:727
+#: ../plugins/project-manager/plugin.c:714
+#, c-format
+msgid "Group: %s\n"
+msgstr "�ลุ�ม: %s\n"
+
+#: ../plugins/project-manager/plugin.c:717
+#, c-format
+msgid "Target: %s\n"
+msgstr "���าหมาย: %s\n"
+
+#: ../plugins/project-manager/plugin.c:720
+#, c-format
+msgid "Source: %s\n"
+msgstr "�อร�ส: %s\n"
+
+#: ../plugins/project-manager/plugin.c:723
+#, c-format
+msgid "Shortcut: %s\n"
+msgstr "�ุ�ลั�: %s\n"
+
+#: ../plugins/project-manager/plugin.c:735
+msgid "The group will not be deleted from the file system."
+msgstr "�ลุ�ม�ี��ะ�ม��ู�ล�ออ��า�ระ�����ม"
+
+#: ../plugins/project-manager/plugin.c:737
+msgid "The source file will not be deleted from the file system."
+msgstr "���ม�อร�ส�ะ�ม��ู�ล�ออ��า�ระ�����ม"
+
+#: ../plugins/project-manager/plugin.c:742
+msgid "Confirm remove"
+msgstr "ยื�ยั��ารล�"
+
+#: ../plugins/project-manager/plugin.c:787
 #, c-format
 msgid ""
 "Failed to remove '%s':\n"
@@ -6894,142 +7005,138 @@ msgstr ""
 "�ม�สามาร�ล� '%s':\n"
 "%s"
 
-#: ../plugins/project-manager/plugin.c:784
+#: ../plugins/project-manager/plugin.c:858
 #, c-format
 msgid "Failed to retrieve URI info of %s: %s"
 msgstr "�ม�สามาร��ึ���อมูล URI �อ� %s: %s"
 
-#: ../plugins/project-manager/plugin.c:822
+#: ../plugins/project-manager/plugin.c:896
 msgid "_Project"
 msgstr "�_�ร��าร"
 
-#: ../plugins/project-manager/plugin.c:826
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:900
+#: ../plugins/project-manager/plugin.c:934
 msgid "_Properties"
 msgstr "�ุ�_สม�ั�ิ"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:905
 msgid "_Refresh"
 msgstr "�รั��_ส��"
 
-#: ../plugins/project-manager/plugin.c:831
+#: ../plugins/project-manager/plugin.c:905
 msgid "Refresh project manager tree"
 msgstr "�รีย���อมูล�หม��อ����ภา�����ม��อ���รื�อ�มือ�ั��าร��ร��าร"
 
-#: ../plugins/project-manager/plugin.c:836
-msgid "Add _Group..."
-msgstr "��ิ�ม_�ลุ�ม..."
+#: ../plugins/project-manager/plugin.c:910
+msgid "Add _Groupâ?¦"
+msgstr "��ิ�ม_�ลุ�ม�"
 
-#: ../plugins/project-manager/plugin.c:836
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:910
+#: ../plugins/project-manager/plugin.c:944
 msgid "Add a group to project"
 msgstr "��ิ�ม�ลุ�ม���า����ร��าร"
 
-#: ../plugins/project-manager/plugin.c:841
-msgid "Add _Target..."
-msgstr "��ิ�ม�_��าหมาย..."
+#: ../plugins/project-manager/plugin.c:915
+msgid "Add _Targetâ?¦"
+msgstr "��ิ�ม�_��าหมาย�"
 
-#: ../plugins/project-manager/plugin.c:841
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:915
+#: ../plugins/project-manager/plugin.c:949
 msgid "Add a target to project"
 msgstr "��ิ�ม���าหมาย���า����ร��าร"
 
-#: ../plugins/project-manager/plugin.c:846
-msgid "Add _Source File..."
-msgstr "��ิ�ม���ม�อร�_ส..."
+#: ../plugins/project-manager/plugin.c:920
+msgid "Add _Source Fileâ?¦"
+msgstr "��ิ�ม���ม�อร�_ส�"
 
-#: ../plugins/project-manager/plugin.c:846
-#: ../plugins/project-manager/plugin.c:865
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:920
+#: ../plugins/project-manager/plugin.c:939
+#: ../plugins/project-manager/plugin.c:954
 msgid "Add a source file to project"
 msgstr "��ิ�ม���ม�อร�ส���า����ร��าร"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:925
 msgid "Close Pro_ject"
 msgstr "�ิ��_�ร��าร"
 
-#: ../plugins/project-manager/plugin.c:851
+#: ../plugins/project-manager/plugin.c:925
 msgid "Close project"
 msgstr "�ิ���ร��าร"
 
-#: ../plugins/project-manager/plugin.c:860
+#: ../plugins/project-manager/plugin.c:934
 msgid "Properties of group/target/source"
 msgstr "�ุ�สม�ั�ิ�อ��ลุ�ม/���าหมาย/�อร�ส"
 
-#: ../plugins/project-manager/plugin.c:865
-msgid "_Add To Project"
+#: ../plugins/project-manager/plugin.c:939
+msgid "_Add to Project"
 msgstr "�_�ิ�ม���า����ร��าร"
 
-#: ../plugins/project-manager/plugin.c:870
+#: ../plugins/project-manager/plugin.c:944
 msgid "Add _Group"
 msgstr "��ิ�ม_�ลุ�ม"
 
-#: ../plugins/project-manager/plugin.c:875
+#: ../plugins/project-manager/plugin.c:949
 msgid "Add _Target"
 msgstr "��ิ�ม�_��าหมาย"
 
-#: ../plugins/project-manager/plugin.c:880
+#: ../plugins/project-manager/plugin.c:954
 msgid "Add _Source File"
 msgstr "��ิ�ม���ม�อร�_ส"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:959
 msgid "Re_move"
 msgstr "�_อาออ�"
 
-#: ../plugins/project-manager/plugin.c:885
+#: ../plugins/project-manager/plugin.c:959
 msgid "Remove from project"
 msgstr "ล�ออ��า���ร��าร"
 
-#: ../plugins/project-manager/plugin.c:1259
+#: ../plugins/project-manager/plugin.c:1377
 #, c-format
 msgid "Loading project: %s"
 msgstr "�ำลั��หล���ร��าร: %s"
 
-#: ../plugins/project-manager/plugin.c:1267
-msgid "Created project view..."
-msgstr "สร�า�มุมมอ��อ���ร��าร�ล�ว..."
+#: ../plugins/project-manager/plugin.c:1385
+msgid "Created project viewâ?¦"
+msgstr "สร�า�มุมมอ��อ���ร��าร�ล�ว�"
 
-#: ../plugins/project-manager/plugin.c:1280
+#: ../plugins/project-manager/plugin.c:1398
 #, c-format
 msgid ""
 "Failed to parse project (the project is opened, but there will be no project "
 "view) %s: %s\n"
 msgstr "�����ร��าร�ม�สำ�ร�� (��ร��าร�ู���ิ�อยู� ����ะ�ม��ส����ร��าร) %s: %s\n"
 
-#: ../plugins/project-manager/plugin.c:1472
+#: ../plugins/project-manager/plugin.c:1591
 #, c-format
 msgid "Error closing project: %s"
 msgstr "��ิ���อ�ิ��ลา���ะ�ิ���ร��าร: %s"
 
-#: ../plugins/project-manager/plugin.c:1536
+#: ../plugins/project-manager/plugin.c:1658
 msgid "Project manager actions"
 msgstr "�าร�ระ�ำ�อ���รื�อ�มือ�ั��าร��ร��าร"
 
-#: ../plugins/project-manager/plugin.c:1544
+#: ../plugins/project-manager/plugin.c:1666
 msgid "Project manager popup actions"
 msgstr "�าร�ระ�ำ���ม�ู�ุ��ึ���อ���รื�อ�มือ�ั��าร��ร��าร"
 
-#: ../plugins/project-manager/plugin.c:2641
-msgid "Initializing Project..."
-msgstr "�ำลั��ั����า�ริ�ม�����ร��าร..."
+#: ../plugins/project-manager/plugin.c:2632
+msgid "Initializing Projectâ?¦"
+msgstr "�ำลั��ั����า�ริ�ม�����ร��าร�"
 
-#: ../plugins/project-manager/plugin.c:2644
+#: ../plugins/project-manager/plugin.c:2635
 msgid "Project Loaded"
 msgstr "�หล���ร��าร�ล�ว"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:1
-msgid "<b>Details</b>"
-msgstr "<b>รายละ�อีย�</b>"
+msgid "Details"
+msgstr "รายละ�อีย�"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.ui.h:2
 #: ../plugins/project-wizard/druid.c:147
 msgid "Error"
 msgstr "��อ�ิ��ลา�"
 
-#: ../plugins/project-wizard/anjuta-project-wizard.ui.h:3
-msgid "Select project type"
-msgstr "�ลือ���ิ���ร��าร"
-
 #: ../plugins/project-wizard/druid.c:139 ../plugins/project-wizard/druid.c:143
 msgid "Warning"
 msgstr "�ำ��ือ�"
@@ -7053,12 +7160,12 @@ msgstr ""
 msgid "Project Type: %s\n"
 msgstr "��ิ���ร��าร: %s\n"
 
-#: ../plugins/project-wizard/druid.c:374
+#: ../plugins/project-wizard/druid.c:377
 #, c-format
 msgid "Unable to find any project template in %s"
 msgstr "�ม����ม������ร��าร���� %s"
 
-#: ../plugins/project-wizard/druid.c:575
+#: ../plugins/project-wizard/druid.c:578
 #, c-format
 msgid ""
 "\n"
@@ -7067,21 +7174,31 @@ msgstr ""
 "\n"
 "��อมูล \"%s\" ������อมูล�ำ���� �รุ�า�รอ���อมูล��วย"
 
-#: ../plugins/project-wizard/druid.c:590
+#: ../plugins/project-wizard/druid.c:593
 #, c-format
 msgid ""
-"Field \"%s\" must start with a letter, a digit or an underscore and contains "
+"Field \"%s\" must start with a letter, a digit or an underscore and contain "
 "only letters, digits, underscore, minus and dot. Please fix it."
 msgstr ""
 "�����อมูล \"%s\" ��อ��ึ�������วย�ัวอั�ษร �ัว�ล� หรือ�ี�ล�า� �ละ����ัวอั�ษร �ัว�ล� �ี�ล�า� "
 "��รื�อ�หมายล� �ละ�ุ�������า�ั�� �รุ�า�����"
 
-#: ../plugins/project-wizard/druid.c:595
+#: ../plugins/project-wizard/druid.c:598
+#, c-format
+msgid ""
+"Field \"%s\" must start with a letter, a digit, an underscore or a directory "
+"separator and contain only letters, digits, underscore, directory separator, "
+"minus and dot. Please fix it."
+msgstr ""
+"�����อมูล \"%s\" ��อ��ึ�������วย�ัวอั�ษร �ัว�ล� �ี�ล�า� หรือ��รื�อ�หมาย�ั�����ร��อรี "
+"�ละ����ัวอั�ษร �ัว�ล� �ี�ล�า� ��รื�อ�หมาย�ั�����ร��อรี ��รื�อ�หมายล� �ละ�ุ�������า�ั�� �รุ�า�����"
+
+#: ../plugins/project-wizard/druid.c:603
 #, c-format
 msgid "Unknown error."
 msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: ../plugins/project-wizard/druid.c:622
+#: ../plugins/project-wizard/druid.c:630
 #, c-format
 msgid ""
 "Directory \"%s\" is not empty. Project creation could fail if some files "
@@ -7090,20 +7207,20 @@ msgstr ""
 "���ร��อรี \"%s\" �ม�ว�า� �ารสร�า���ร��ารอา��ม�สำ�ร����า��ีย��า����ม�ม���� "
 "�ุ���อ��าร�ำ��อ��หรือ�ม�?"
 
-#: ../plugins/project-wizard/druid.c:624
+#: ../plugins/project-wizard/druid.c:632
 #, c-format
 msgid "File \"%s\" already exists. Do you want to overwrite it?"
 msgstr "���ม \"%s\" มีอยู��ล�ว ��อ��าร��ีย��ั�หรือ�ม�?"
 
-#: ../plugins/project-wizard/druid.c:655
+#: ../plugins/project-wizard/druid.c:663
 msgid "Invalid entry"
 msgstr "�าร�รอ���อมูล�ม��ู���อ�"
 
-#: ../plugins/project-wizard/druid.c:666
+#: ../plugins/project-wizard/druid.c:674
 msgid "Dubious entry"
 msgstr "�าร�รอ���อมูล��าส�สัย"
 
-#: ../plugins/project-wizard/druid.c:776
+#: ../plugins/project-wizard/druid.c:784
 #, c-format
 msgid ""
 "\n"
@@ -7112,7 +7229,7 @@ msgstr ""
 "\n"
 "�า���ร��รม: %s"
 
-#: ../plugins/project-wizard/druid.c:787
+#: ../plugins/project-wizard/druid.c:795
 #, c-format
 msgid ""
 "\n"
@@ -7121,7 +7238,7 @@ msgstr ""
 "\n"
 "�า�������: %s"
 
-#: ../plugins/project-wizard/druid.c:795
+#: ../plugins/project-wizard/druid.c:803
 msgid ""
 "Some important programs or development packages required to build this "
 "project are missing. Please make sure they are installed properly before "
@@ -7130,25 +7247,25 @@ msgstr ""
 "��ร��รมหรือ������สำหรั��าร�ั��า�า�อย�า��ี���อ�������าร�ระ�อ�สร�า���ร��าร�ี��า�หาย�� "
 "�รุ�า�����ว�า����ิ��ั��สิ���ั��ล�าว�ล�วอย�า��ู���อ� ��อ��ี��ะสร�า���ร��าร\n"
 
-#: ../plugins/project-wizard/druid.c:801
+#: ../plugins/project-wizard/druid.c:809
 msgid ""
 "The missing programs are usually part of some distrubution packages and can "
-"be searched in your Application Manager. Similarly, the development packages "
-"are contained in special packages that your distribution provide to allow "
-"development of projects based on them. They usually end with -dev or -devel "
-"suffix in package names and can be found by searching in your Application "
-"Manager."
+"be searched for in your Application Manager. Similarly, the development "
+"packages are contained in special packages that your distribution provides "
+"to allow development of projects based on them. They usually end with a \"-"
+"dev\" or \"-devel\" suffix in package names and can be found by searching in "
+"your Application Manager."
 msgstr ""
 "��ร��รม�ี��า�มั�อยู����������อ��ุ������าย �ละสามาร����หา�������รื�อ�มือ�ั��าร��ร��รม "
 "���ำ�อ���ียว�ั� ������สำหรั��าร�ั��า�ะอยู����������ิ�ศษ�ึ���ู������าย�อ��ุ��ะ��รียม�ว� "
-"��ื�อ�าร�ั��า��ร��าร�ี�����������หล�า�ั�� �������ั��ล�าวมั�มี�ื�อล���าย��วย -dev หรือ -devel "
-"�ละสามาร����หา�������รื�อ�มือ�ั��าร��ร��รม�อ��ุ�"
+"��ื�อ�าร�ั��า��ร��าร�ี�����������หล�า�ั�� �������ั��ล�าวมั�มี�ื�อล���าย��วย \"-dev\" หรือ \"-"
+"devel\" �ละสามาร����หา�������รื�อ�มือ�ั��าร��ร��รม�อ��ุ�"
 
-#: ../plugins/project-wizard/druid.c:809
+#: ../plugins/project-wizard/druid.c:817
 msgid "Missing components"
 msgstr "�า�อ����ระ�อ�"
 
-#: ../plugins/project-wizard/druid.c:941
+#: ../plugins/project-wizard/druid.c:949
 #, c-format
 msgid "Unable to build project assistant user interface reading %s."
 msgstr "�ม�สามาร�สร�า�ส�ว��ิ���อ�ู�����อ���รื�อ�มือ��วยสร�า���ร��าร ��ะอ�า� %s"
@@ -7168,18 +7285,18 @@ msgstr "�ำลั���าม %s: ���มมีอยู���อ
 
 #: ../plugins/project-wizard/install.c:503
 #, c-format
-msgid "Creating %s ... Fail to create directory"
-msgstr "�ำลั�สร�า� %s ... สร�า����ร��อรี�ม�สำ�ร��"
+msgid "Creating %s â?¦ Failed to create directory"
+msgstr "�ำลั�สร�า� %s � สร�า����ร��อรี�ม�สำ�ร��"
 
 #: ../plugins/project-wizard/install.c:519
 #, c-format
-msgid "Creating %s (using AutoGen)... %s"
-msgstr "�ำลั�สร�า� %s (��ย��� AutoGen)... %s"
+msgid "Creating %s (using AutoGen)â?¦ %s"
+msgstr "�ำลั�สร�า� %s (��ย��� AutoGen)� %s"
 
 #: ../plugins/project-wizard/install.c:524
 #, c-format
-msgid "Creating %s ... %s"
-msgstr "�ำลั�สร�า� %s ... %s"
+msgid "Creating %s â?¦ %s"
+msgstr "�ำลั�สร�า� %s � %s"
 
 #. The %s is a name of a unix command line, by example
 #. * cp foobar.c project
@@ -7192,34 +7309,34 @@ msgstr "�ำลั��รีย��ำ�า�: %s"
 msgid "New Project Assistant"
 msgstr "��รื�อ�มือ��วยสร�า���ร��าร�หม�"
 
-#: ../plugins/project-wizard/property.c:288
-#: ../plugins/project-wizard/property.c:401
+#: ../plugins/project-wizard/property.c:311
+#: ../plugins/project-wizard/property.c:424
 msgid "No"
 msgstr "�ม�"
 
-#: ../plugins/project-wizard/property.c:299
+#: ../plugins/project-wizard/property.c:322
 msgid "Select directory"
 msgstr "�ลือ����ร��อรี"
 
-#: ../plugins/project-wizard/property.c:307
+#: ../plugins/project-wizard/property.c:330
 msgid "Select file"
 msgstr "�ลือ����ม"
 
-#: ../plugins/project-wizard/property.c:359 ../plugins/tools/editor.c:522
+#: ../plugins/project-wizard/property.c:382 ../plugins/tools/editor.c:522
 msgid "Select an Image File"
 msgstr "�ลือ����มภา�"
 
-#: ../plugins/project-wizard/property.c:384
-#: ../plugins/project-wizard/property.c:474 ../plugins/tools/editor.c:556
+#: ../plugins/project-wizard/property.c:407
+#: ../plugins/project-wizard/property.c:497 ../plugins/tools/editor.c:556
 #: ../plugins/tools/editor.c:703
 msgid "Choose Icon"
 msgstr "�ลือ��อ�อ�"
 
-#: ../plugins/project-wizard/property.c:444
+#: ../plugins/project-wizard/property.c:467
 msgid "Choose directory"
 msgstr "�ลือ����ร��อรี"
 
-#: ../plugins/project-wizard/property.c:448
+#: ../plugins/project-wizard/property.c:471
 msgid "Choose file"
 msgstr "�ลือ����ม"
 
@@ -7248,8 +7365,8 @@ msgid "A generic Xlib project"
 msgstr "��ร��าร Xlib ��รู��ั�ว��"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:7
-msgid "A generic java project using automake project management"
-msgstr "��ร��าร Java ��รู��ั�ว�� ��ย�ั��าร��ร��าร��วย automake"
+msgid "A generic Java project using automake project management"
+msgstr "��ร��าร�าวา��รู��ั�ว�� ��ย�ั��าร��ร��าร��วย automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:8
 msgid "A generic minimal and flat project"
@@ -7257,7 +7374,7 @@ msgstr "��ร��าร�ั�ว������ล���ี�ส
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:9
 msgid ""
-"A generic natively compiled java project using the GNU Java Compiler (gcj)"
+"A generic natively compiled Java project using the GNU Java Compiler (gcj)"
 msgstr "��ร��าร�าวา�ี��อม��ล���� native ��รู��ั�ว�� ��ย����อม���ลอร��าวา GNU (gcj)"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:10
@@ -7265,168 +7382,177 @@ msgid "A generic project"
 msgstr "��ร��าร��รู��ั�ว��"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:11
-msgid "A generic python project using automake project management"
-msgstr "��ร��าร Python ��รู��ั�ว�� ��ย�ั��าร��ร��าร��วย automake"
+msgid "A generic Python project using automake project management"
+msgstr "��ร��าร���อ���รู��ั�ว�� ��ย�ั��าร��ร��าร��วย automake"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:12
-msgid "A generic wx Widgets project"
-msgstr "��ร��าร wx Widgets ��รู��ั�ว��"
+msgid "A generic wxWidgets project"
+msgstr "��ร��าร wxWidgets ��รู��ั�ว��"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:13
 msgid "A sample SDL project"
 msgstr "��ร��าร SDL �ัวอย�า�"
 
 #: ../plugins/project-wizard/templates/translatable-strings.h:14
+msgid "A shared or a static library project"
+msgstr "��ร��าร�ล�รารี���ร�วมหรือ�ล�รารี�ส��ิ�"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:15
 msgid "Add C++ support:"
 msgstr "��ิ�ม�ารรอ�รั� C++:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:15
+#: ../plugins/project-wizard/templates/translatable-strings.h:16
 msgid "Add gtk-doc system:"
 msgstr "��ิ�มระ�� gtk-doc:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:16
+#: ../plugins/project-wizard/templates/translatable-strings.h:17
 msgid "Add internationalization:"
 msgstr "��ิ�ม�ารรอ�รั��า�าภาษา:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:17
+#: ../plugins/project-wizard/templates/translatable-strings.h:18
 msgid "Add shared library support:"
 msgstr "��ิ�ม�ารรอ�รั��ล�รารี���ร�วม:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:18
+#: ../plugins/project-wizard/templates/translatable-strings.h:19
 msgid "Adds C++ support to the project so that C++ source files can be built"
 msgstr "��ิ�ม�ารรอ�รั� C++ ���า����ร��าร ��ื�อ�ห�สามาร��ระ�อ�สร�า��า����ม�อร�ส C++ ���"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:19
+#: ../plugins/project-wizard/templates/translatable-strings.h:20
 msgid "Adds support for building shared libraries in your project"
 msgstr "��ิ�ม�ารรอ�รั��ารสร�า��ล�รารี���ร�วม����ร��าร�อ��ุ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:20
+#: ../plugins/project-wizard/templates/translatable-strings.h:21
 msgid ""
 "Adds support for internationalization so that your project can have "
 "translations in different languages"
 msgstr "��ิ�ม�ารรอ�รั��ารรอ�รั��า�าภาษา ��ื�อ�ห���ร��าร�อ��ุ�สามาร���ล����ภาษา��า�� ���"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:21
+#: ../plugins/project-wizard/templates/translatable-strings.h:22
 msgid "Anjuta Plugin"
 msgstr "�ลั��อิ��อ��ู�า"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:22
+#: ../plugins/project-wizard/templates/translatable-strings.h:23
 msgid "Anjuta plugin project that uses libanjuta framework"
 msgstr "��ร��าร�ลั��อิ��อ��อ��ู�า��ย����รอ��า� libanjuta"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:23
+#: ../plugins/project-wizard/templates/translatable-strings.h:24
 msgid "Applet Title:"
 msgstr "�ื�อ�อ���ล��:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:25
+#: ../plugins/project-wizard/templates/translatable-strings.h:26
 msgid "Basic information"
 msgstr "��อมูล��ื�อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:26
+#: ../plugins/project-wizard/templates/translatable-strings.h:27
 msgid "Berkeley Software Distribution License (BSD)"
 msgstr "สั��าอ�ุ�า������าย�อ����วร���ิร��ลีย� (BSD)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:27
+#: ../plugins/project-wizard/templates/translatable-strings.h:28
+msgid "Build library as"
+msgstr "�ระ�อ�สร�า��ล�รารี����"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:29
 msgid ""
-"Comma separated, other plugins that this plugin depends on. It could be "
+"Comma-separated, other plugins that this plugin depends on. It could be "
 "either primary interface name or plugin location (library:class)"
 msgstr ""
 "ราย�ื�อ�ลั��อิ�อื���ี��ลั��อิ��ี���อ���� �ั����วย�ุลภา� อา������ื�ออิ���อร����หลั�หรือ�ำ�ห����อ��ลั��อิ� "
 "(library:class)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:28
+#: ../plugins/project-wizard/templates/translatable-strings.h:30
 msgid "Configure external packages"
 msgstr "�ั����า������ภาย�อ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:29
+#: ../plugins/project-wizard/templates/translatable-strings.h:31
 msgid "Configure external packages:"
 msgstr "�ั����า������ภาย�อ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:30
-msgid "Create Gtk Builder interface file"
-msgstr "สร�า����มส�ว��ิ���อ�ู�����อ� Gtk Builder"
-
-#: ../plugins/project-wizard/templates/translatable-strings.h:31
-msgid "Create a template Gtk Builder interface file"
-msgstr "สร�า����ม�ม����ส�ว��ิ���อ�ู�����อ� Gtk Builder"
-
 #: ../plugins/project-wizard/templates/translatable-strings.h:32
-msgid "Create a template gtk builder interface file"
-msgstr "สร�า����ม�ม����ส�ว��ิ���อ�ู�����อ� gtk builder"
+msgid "Create GtkBuilder interface file"
+msgstr "สร�า����มส�ว��ิ���อ�ู�����อ� GtkBuilder"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:35
+#: ../plugins/project-wizard/templates/translatable-strings.h:33
+#: ../plugins/project-wizard/templates/translatable-strings.h:34
+msgid "Create a template GtkBuilder interface file"
+msgstr "สร�า����ม�ม����ส�ว��ิ���อ�ู�����อ� GtkBuilder"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:37
 msgid "Display description of the applet"
 msgstr "�ส���ำอ�ิ�าย�อ���ล��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:36
+#: ../plugins/project-wizard/templates/translatable-strings.h:38
 msgid "Display description of the plugin"
 msgstr "�ส���ำอ�ิ�าย�ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:37
+#: ../plugins/project-wizard/templates/translatable-strings.h:39
 msgid "Display title of the applet"
 msgstr "�ส���ื�อ�อ���ล��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:38
+#: ../plugins/project-wizard/templates/translatable-strings.h:40
 msgid "Display title of the plugin"
 msgstr "�ส���ื�อ�ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:39
+#: ../plugins/project-wizard/templates/translatable-strings.h:41
 msgid "Django Project"
 msgstr "��ร��าร Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:40
+#: ../plugins/project-wizard/templates/translatable-strings.h:42
 msgid "Django Project information"
 msgstr "��อมูล��ร��าร Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:41
+#: ../plugins/project-wizard/templates/translatable-strings.h:43
 msgid "Email address:"
 msgstr "�ี�อยู�อี�มล:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:42
+#: ../plugins/project-wizard/templates/translatable-strings.h:44
 msgid "GCJ needs to know which class contains the main() function"
 msgstr "GCJ �ำ������อ�รู�ว�า�ลาส���รร�ุ�ั����ั� main()"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:43
+#: ../plugins/project-wizard/templates/translatable-strings.h:45
 msgid "GNOME Applet"
 msgstr "�อ���ล�� GNOME"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:44
+#: ../plugins/project-wizard/templates/translatable-strings.h:46
 msgid "GTK+"
 msgstr "GTK+"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:45
+#: ../plugins/project-wizard/templates/translatable-strings.h:47
 msgid "GTKmm"
 msgstr "GTKmm"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:46
+#: ../plugins/project-wizard/templates/translatable-strings.h:48
 msgid "General Project Information"
 msgstr "��อมูล�ั�ว���อ���ร��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:48
+#: ../plugins/project-wizard/templates/translatable-strings.h:50
 msgid "Generic"
 msgstr "�ั�ว��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:49
+#: ../plugins/project-wizard/templates/translatable-strings.h:51
 msgid "Generic (Minimal)"
 msgstr "�ั�ว�� (�ล���ี�สุ�)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:50
+#: ../plugins/project-wizard/templates/translatable-strings.h:52
 msgid "Generic C++"
 msgstr "C++ �ั�ว��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:51
-msgid "Generic gcj compiled java"
+#: ../plugins/project-wizard/templates/translatable-strings.h:53
+msgid "Generic JavaScript"
+msgstr "�าวาส�ริ����ั�ว��"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:54
+msgid "Generic gcj compiled Java"
 msgstr "�าวา�ั�ว���ี��อม��ล���วย gcj"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:52
-msgid "Generic java (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:55
+msgid "Generic Java (automake)"
 msgstr "�าวา�ั�ว�� (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:53
-msgid "Generic python (automake)"
+#: ../plugins/project-wizard/templates/translatable-strings.h:56
+msgid "Generic Python (automake)"
 msgstr "���อ��ั�ว�� (automake)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:54
+#: ../plugins/project-wizard/templates/translatable-strings.h:57
 msgid ""
 "Give a package name that your project require. You may also mention what is "
 "the required version of the package. For example, 'libgnomeui-2.0' or "
@@ -7435,215 +7561,235 @@ msgstr ""
 "��อ��ื�อ�������ี���ร��าร�ุ���อ���� �ุ�อา�ระ�ุรุ���อ��������ี���อ��าร��วย����� �ัวอย�า����� "
 "'libgnomeui-2.0' หรือ 'libgnomeui-2.0 >= 2.2.0'"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:55
+#: ../plugins/project-wizard/templates/translatable-strings.h:58
 msgid "Icon File:"
 msgstr "���ม�อ�อ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:56
+#: ../plugins/project-wizard/templates/translatable-strings.h:59
 msgid "Icon file for the plugin"
 msgstr "���ม�อ�อ�สำหรั��ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:57
+#: ../plugins/project-wizard/templates/translatable-strings.h:60
 msgid "Implement plugin interfaces"
 msgstr "�ำอิ���อร����สำหรั��ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:58
+#: ../plugins/project-wizard/templates/translatable-strings.h:61
 msgid "Interface implemented by the plugin"
 msgstr "อิ���อร�����ี��ลั��อิ��ำ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:59
+#: ../plugins/project-wizard/templates/translatable-strings.h:62
 msgid "Interface:"
 msgstr "ส�ว��ิ���อ:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:61
+#: ../plugins/project-wizard/templates/translatable-strings.h:64
+msgid "Library"
+msgstr "�ล�รารี"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:65
 msgid "License"
 msgstr "สั��าอ�ุ�า�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:62
+#: ../plugins/project-wizard/templates/translatable-strings.h:66
 msgid "Main Class:"
 msgstr "�ลาสหลั�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:63
+#: ../plugins/project-wizard/templates/translatable-strings.h:67
 msgid "Main class"
 msgstr "�ลาสหลั�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:64
+#: ../plugins/project-wizard/templates/translatable-strings.h:68
 msgid "Makefile project"
 msgstr "��ร��าร Makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:65
+#: ../plugins/project-wizard/templates/translatable-strings.h:69
 msgid "Makefile-based project"
 msgstr "��ร��าร�ี���� Makefile"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:66
+#: ../plugins/project-wizard/templates/translatable-strings.h:70
 msgid "Mininum SDL version required"
 msgstr "SDL รุ���ี���ำ�ี�สุ��ี���อ��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:67
+#: ../plugins/project-wizard/templates/translatable-strings.h:71
 msgid "Name of the value to watch"
 msgstr "�ื�อ�อ���า�ี����า�ู"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:68
+#: ../plugins/project-wizard/templates/translatable-strings.h:72
 msgid "No license"
 msgstr "�ม�มีสั��าอ�ุ�า�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:69
+#: ../plugins/project-wizard/templates/translatable-strings.h:73
+msgid "Only Shared"
+msgstr "���ร�วม���า�ั��"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:74
+msgid "Only Static"
+msgstr "ส���ิ����า�ั��"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:75
 msgid "Options for project build system"
 msgstr "�ัว�ลือ�สำหรั�ระ���ระ�อ�สร�า���ร��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:70
+#: ../plugins/project-wizard/templates/translatable-strings.h:76
 msgid "Plugin Class Name:"
 msgstr "�ื�อ�ลาส�อ��ลั��อิ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:71
+#: ../plugins/project-wizard/templates/translatable-strings.h:77
 msgid "Plugin Dependencies:"
 msgstr "สิ���ี��ลั��อิ���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:72
+#: ../plugins/project-wizard/templates/translatable-strings.h:78
 msgid "Plugin Description:"
 msgstr "�ำ�รรยาย�ลั��อิ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:73
+#: ../plugins/project-wizard/templates/translatable-strings.h:79
 msgid "Plugin Title:"
 msgstr "�ื�อ�ลั��อิ�:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:74
+#: ../plugins/project-wizard/templates/translatable-strings.h:80
 msgid "Plugin class name"
 msgstr "�ื�อ�ลาส�อ��ลั��อิ�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:75
-msgid "Plugin has menus or/and toolbars"
+#: ../plugins/project-wizard/templates/translatable-strings.h:81
+msgid "Plugin has menus and/or toolbars"
 msgstr "�ลั��อิ�มี�ม�ู�ละ/หรือ�����รื�อ�มือ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:76
+#: ../plugins/project-wizard/templates/translatable-strings.h:82
 msgid "Plugin interfaces to implement"
 msgstr "อิ���อร����สำหรั��ลั��อิ��ี��ะ�ำ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:77
+#: ../plugins/project-wizard/templates/translatable-strings.h:83
 msgid "Project Name:"
 msgstr "�ื�อ��ร��าร:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:78
-msgid "Project directory, output file etc."
+#: ../plugins/project-wizard/templates/translatable-strings.h:84
+msgid "Project directory, output file, etc."
 msgstr "���ร��อรี��ร��าร ���ม�ลลั��� ฯลฯ"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:79
+#: ../plugins/project-wizard/templates/translatable-strings.h:85
 msgid "Project directory:"
 msgstr "���ร��อรี��ร��าร:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:80
+#: ../plugins/project-wizard/templates/translatable-strings.h:86
 msgid ""
 "Project name must not contain spaces, because it will be the name of the "
-"project build target (executable, library etc.)"
+"project build target (executable, library, etc.)"
 msgstr ""
 "�ื�อ��ร��าร�ะ��อ��ม�มี��อ�ว�า� ��ราะ�ะ��������ื�อ�อ����าหมาย�าร�ระ�อ�สร�า�����ร��าร (���� "
 "���ม��ร��รม, �ล�รารี ฯลฯ)"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:81
+#: ../plugins/project-wizard/templates/translatable-strings.h:87
 msgid "Project name:"
 msgstr "�ื�อ��ร��าร:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:82
+#: ../plugins/project-wizard/templates/translatable-strings.h:88
 msgid "Project options"
 msgstr "�ัว�ลือ�สำหรั���ร��าร"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:83
-msgid "Python webproject using Django Web Framework"
+#: ../plugins/project-wizard/templates/translatable-strings.h:89
+msgid "Python web project using Django Web Framework"
 msgstr "��ร��าร�ว����วย���อ� ��ย����รอ��า��ว�� Django"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:84
+#: ../plugins/project-wizard/templates/translatable-strings.h:90
 msgid "Require Package:"
 msgstr "�������ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:85
+#: ../plugins/project-wizard/templates/translatable-strings.h:91
 msgid "Require SDL version:"
 msgstr "รุ�� SDL �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:86
+#: ../plugins/project-wizard/templates/translatable-strings.h:92
 msgid "Require SDL_gfx library"
 msgstr "SDL_gfx library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:87
+#: ../plugins/project-wizard/templates/translatable-strings.h:93
 msgid "Require SDL_gfx:"
 msgstr "SDL_gfx �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:88
+#: ../plugins/project-wizard/templates/translatable-strings.h:94
 msgid "Require SDL_image library"
 msgstr "SDL_image library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:89
+#: ../plugins/project-wizard/templates/translatable-strings.h:95
 msgid "Require SDL_image:"
 msgstr "SDL_image �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:90
+#: ../plugins/project-wizard/templates/translatable-strings.h:96
 msgid "Require SDL_mixer library"
 msgstr "SDL_mixer library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:91
+#: ../plugins/project-wizard/templates/translatable-strings.h:97
 msgid "Require SDL_mixer:"
 msgstr "SDL_mixer �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:92
+#: ../plugins/project-wizard/templates/translatable-strings.h:98
 msgid "Require SDL_net library"
 msgstr "SDL_net library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:93
+#: ../plugins/project-wizard/templates/translatable-strings.h:99
 msgid "Require SDL_net:"
 msgstr "SDL_net �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:94
+#: ../plugins/project-wizard/templates/translatable-strings.h:100
 msgid "Require SDL_ttf library"
 msgstr "SDL_ttf library �ี���อ����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:95
+#: ../plugins/project-wizard/templates/translatable-strings.h:101
 msgid "Require SDL_ttf:"
 msgstr "SDL_ttf �ี���อ����:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:96
+#: ../plugins/project-wizard/templates/translatable-strings.h:102
 msgid "SDL"
 msgstr "SDL"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:97
+#: ../plugins/project-wizard/templates/translatable-strings.h:103
 msgid "Select code license"
 msgstr "�ลือ�สั��าอ�ุ�า��อ�����"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:98
+#: ../plugins/project-wizard/templates/translatable-strings.h:104
+msgid "Select library type to build"
+msgstr "�ลือ���ิ��อ��ล�รารี�ี��ะ�ระ�อ�สร�า�"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:105
+msgid "Shared and Static library"
+msgstr "�ล�รารี���ร�วม�ละส���ิ�"
+
+#: ../plugins/project-wizard/templates/translatable-strings.h:106
 msgid "Shell values to watch"
 msgstr "��า�อ���ลล��ี��ะ���า�ู"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:99
+#: ../plugins/project-wizard/templates/translatable-strings.h:107
 msgid "Use pkg-config to add library support from other packages"
 msgstr "��� pkg-config ��ิ�ม�ารรอ�รั��ล�รารี�า�������อื��"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:100
+#: ../plugins/project-wizard/templates/translatable-strings.h:108
 msgid "Value Name:"
 msgstr "�ื�อ��า:"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:101
+#: ../plugins/project-wizard/templates/translatable-strings.h:109
 msgid "Values to watch"
 msgstr "��า�ี��ะ���า�ู"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:103
+#: ../plugins/project-wizard/templates/translatable-strings.h:111
 msgid "Whether the plugin has menus or toolbars"
 msgstr "�ำห��ว�า�ลั��อิ�มี�ม�ูหรือ�����รื�อ�มือหรือ�ม�"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:104
-msgid "Wx Widgets"
-msgstr "Wx Widgets"
+#: ../plugins/project-wizard/templates/translatable-strings.h:112
+msgid "wxWidgets"
+msgstr "wxWidgets"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:105
+#: ../plugins/project-wizard/templates/translatable-strings.h:113
 msgid "Xlib"
 msgstr "Xlib"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:106
+#: ../plugins/project-wizard/templates/translatable-strings.h:114
 msgid "Xlib dock"
 msgstr "Xlib dock"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:107
-msgid "gtk-doc is used to compile API documentations for GObject based classes"
-msgstr "gtk-doc �ะ�ู�������าร�อม��ล��อ�สาร API สำหรั��ลาส�ี�อิ� GObject"
+#: ../plugins/project-wizard/templates/translatable-strings.h:115
+msgid "gtk-doc is used to compile API documentation for GObject-based classes"
+msgstr "��� gtk-doc ���าร�อม��ล��อ�สาร API สำหรั��ลาส�ี�อิ� GObject"
 
-#: ../plugins/project-wizard/templates/translatable-strings.h:108
+#: ../plugins/project-wizard/templates/translatable-strings.h:116
 msgid "project name"
 msgstr "�ื�อ��ร��าร"
 
@@ -7664,18 +7810,13 @@ msgid "Program:"
 msgstr "��ร��รม:"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:6
-msgid "Run In Terminal"
+msgid "Run in Terminal"
 msgstr "�รีย�����อร�มิ�ัล"
 
 #: ../plugins/run-program/anjuta-run-program.ui.h:7
 msgid "Working Directory:"
 msgstr "���ร��อรี�ำ�า�:"
 
-#: ../plugins/run-program/execute.c:76
-#, c-format
-msgid "Program '%s' does not exist"
-msgstr "��ร��รม '%s' �ม�มีอยู�"
-
 #. Only local directory are supported
 #: ../plugins/run-program/execute.c:107
 #, c-format
@@ -7686,16 +7827,11 @@ msgstr "���ร��อรี��ร��รม '%s' �ม����
 msgid "Load Target to run"
 msgstr "�หล����าหมาย�ี��ะ�รีย��ำ�า�"
 
-#: ../plugins/run-program/parameters.c:616
+#: ../plugins/run-program/parameters.c:617
 #, c-format
 msgid "Missing file %s"
 msgstr "�า����ม %s"
 
-#: ../plugins/run-program/parameters.c:749
-#: ../plugins/search/search_preferences.c:534
-msgid "Name"
-msgstr "�ื�อ"
-
 #: ../plugins/run-program/plugin.c:191
 msgid ""
 "The program is running.\n"
@@ -7706,191 +7842,190 @@ msgstr ""
 
 #. Action name
 #. Stock icon, if any
-#: ../plugins/run-program/plugin.c:229
+#: ../plugins/run-program/plugin.c:231
 msgid "_Run"
 msgstr "�_รีย��ำ�า�"
 
-#: ../plugins/run-program/plugin.c:237
+#: ../plugins/run-program/plugin.c:239
 #: ../plugins/build-basic-autotools/anjuta-build-basic-autotools.plugin.in.h:3
 msgid "Execute"
 msgstr "�รีย��ำ�า�"
 
-#: ../plugins/run-program/plugin.c:239
+#: ../plugins/run-program/plugin.c:241
 msgid "Run program without debugger"
 msgstr "�รีย���ร��รม�ำ�า���ย�ม���า���รื�อ�มือ�ี�ั��"
 
-#: ../plugins/run-program/plugin.c:245
+#: ../plugins/run-program/plugin.c:247
 msgid "Stop Program"
 msgstr "หยุ���ร��รม"
 
-#: ../plugins/run-program/plugin.c:247
+#: ../plugins/run-program/plugin.c:249
 msgid "Kill program"
 msgstr "��า��ร��รม"
 
-#: ../plugins/run-program/plugin.c:253
-msgid "Program Parameters..."
-msgstr "�ารามิ��อร��อ���ร��รม..."
-
 #: ../plugins/run-program/plugin.c:255
-msgid "Set current program, arguments and so on"
-msgstr "�ั����า��ร��รม�ั��ุ�ั� อาร��ิว�ม��� �ละอื���"
+msgid "Program Parametersâ?¦"
+msgstr "�ารามิ��อร��อ���ร��รม�"
+
+#: ../plugins/run-program/plugin.c:257
+msgid "Set current program, arguments, etc."
+msgstr "�ั����า��ร��รม�ั��ุ�ั� อาร��ิว�ม��� ฯลฯ"
 
-#: ../plugins/run-program/plugin.c:280
+#: ../plugins/run-program/plugin.c:282
 msgid "Run operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั��าร�รีย��ำ�า�"
 
 #: ../plugins/search/anjuta-search.ui.h:1
-msgid "<b>Actions</b>"
-msgstr "<b>�าร�ระ�ำ</b>"
+msgid "Actions"
+msgstr "�าร�ระ�ำ"
 
 #: ../plugins/search/anjuta-search.ui.h:2
-msgid "<b>File Filter</b>"
-msgstr "<b>�ัว�รอ����ม</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:4
-msgid "<b>Parameters</b>"
-msgstr "<b>�ารามิ��อร�</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:5
-msgid "<b>Scope</b>"
-msgstr "<b>�อ����</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:6
-msgid "<b>Search variable</b>"
-msgstr "<b>�ัว��ร�อ��าร���หา</b>"
-
-#: ../plugins/search/anjuta-search.ui.h:7
 #: ../plugins/search/search-replace.c:92
 msgid "Backward"
 msgstr "�อยหลั�"
 
-#: ../plugins/search/anjuta-search.ui.h:8
+#: ../plugins/search/anjuta-search.ui.h:3
 msgid "Basic Search & Replace"
 msgstr "���หา�ละ����ี�����รรม�า"
 
-#: ../plugins/search/anjuta-search.ui.h:9
+#: ../plugins/search/anjuta-search.ui.h:4
 msgid "Choose Directories:"
 msgstr "�ลือ����ร��อรี:"
 
-#: ../plugins/search/anjuta-search.ui.h:10
+#: ../plugins/search/anjuta-search.ui.h:5
 msgid "Choose Files:"
 msgstr "�ลือ����ม:"
 
-#: ../plugins/search/anjuta-search.ui.h:11
+#: ../plugins/search/anjuta-search.ui.h:6
 msgid "Expand regex back references"
 msgstr "�ยาย�ารอ�า�อิ��ลั����ิ�����ร�ิวลาร�"
 
-#: ../plugins/search/anjuta-search.ui.h:12
+#: ../plugins/search/anjuta-search.ui.h:7
+msgid "File Filter"
+msgstr "�ัว�รอ����ม"
+
+#: ../plugins/search/anjuta-search.ui.h:8
 msgid "Find & Replace"
 msgstr "หา�ละ����ี�"
 
-#: ../plugins/search/anjuta-search.ui.h:13
+#: ../plugins/search/anjuta-search.ui.h:9
 #: ../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.ui.h:14
+#: ../plugins/search/anjuta-search.ui.h:10
 #: ../plugins/search/search-replace.c:90
 msgid "Full Buffer"
 msgstr "���ม�ั���อร�"
 
-#: ../plugins/search/anjuta-search.ui.h:15
+#: ../plugins/search/anjuta-search.ui.h:11
 msgid "Greedy matching"
 msgstr "���หา����ั��ู�มา��ี�สุ�"
 
-#: ../plugins/search/anjuta-search.ui.h:16
+#: ../plugins/search/anjuta-search.ui.h:12
 msgid "Ignore Binary Files"
 msgstr "ละ�ลย���ม���ารี"
 
-#: ../plugins/search/anjuta-search.ui.h:17
+#: ../plugins/search/anjuta-search.ui.h:13
 msgid "Ignore Directories:"
 msgstr "ละ�ลย���ร��อรี:"
 
-#: ../plugins/search/anjuta-search.ui.h:18
+#: ../plugins/search/anjuta-search.ui.h:14
 msgid "Ignore Files:"
 msgstr "ละ�ลย���ม:"
 
-#: ../plugins/search/anjuta-search.ui.h:19
+#: ../plugins/search/anjuta-search.ui.h:15
 msgid "Ignore Hidden Directories"
 msgstr "ละ�ลย���ร��อรี��อ�"
 
-#: ../plugins/search/anjuta-search.ui.h:20
+#: ../plugins/search/anjuta-search.ui.h:16
 msgid "Ignore Hidden Files"
 msgstr "ละ�ลย���ม��อ�"
 
-#: ../plugins/search/anjuta-search.ui.h:21
+#: ../plugins/search/anjuta-search.ui.h:17
 msgid "Match at start of word"
 msgstr "�ั��ู��ี�����ำ"
 
-#: ../plugins/search/anjuta-search.ui.h:23
+#: ../plugins/search/anjuta-search.ui.h:19
 msgid "Match complete lines"
 msgstr "�ั��ู��ั���รร�ั�"
 
-#: ../plugins/search/anjuta-search.ui.h:24
+#: ../plugins/search/anjuta-search.ui.h:20
 msgid "Match complete words"
 msgstr "�ั��ู��ั���ำ"
 
-#: ../plugins/search/anjuta-search.ui.h:25
+#: ../plugins/search/anjuta-search.ui.h:21
 msgid "Maximum Actions"
 msgstr "�าร�ระ�ำสู�สุ�"
 
-#: ../plugins/search/anjuta-search.ui.h:26
+#: ../plugins/search/anjuta-search.ui.h:22
 msgid "Modify"
 msgstr "�รั���ลี�ย�"
 
-#: ../plugins/search/anjuta-search.ui.h:27
+#: ../plugins/search/anjuta-search.ui.h:23
 msgid "New Name:"
 msgstr "�ื�อ�หม�:"
 
-#: ../plugins/search/anjuta-search.ui.h:28
+#: ../plugins/search/anjuta-search.ui.h:24
 msgid "No Limit"
 msgstr "�ม��ำ�ั�"
 
-#: ../plugins/search/anjuta-search.ui.h:29
+#: ../plugins/search/anjuta-search.ui.h:26
+msgid "Parameters"
+msgstr "�ารามิ��อร�"
+
+#: ../plugins/search/anjuta-search.ui.h:27
 msgid "Regular expression"
 msgstr "�ิ�����ร�ิวลาร�"
 
-#: ../plugins/search/anjuta-search.ui.h:30
+#: ../plugins/search/anjuta-search.ui.h:28
 msgid "Replace With:"
 msgstr "����ี���วย:"
 
-#: ../plugins/search/anjuta-search.ui.h:31
+#: ../plugins/search/anjuta-search.ui.h:30
 msgid "Search Action:"
 msgstr "�าร�ระ�ำ��ะ���หา:"
 
-#: ../plugins/search/anjuta-search.ui.h:32
+#: ../plugins/search/anjuta-search.ui.h:31
 msgid "Search Direction:"
 msgstr "�ิศ�า��าร���หา:"
 
+#. This is "the search expression" (noun)
 #: ../plugins/search/anjuta-search.ui.h:33
 msgid "Search Expression"
 msgstr "�ิ�������หา"
 
-#: ../plugins/search/anjuta-search.ui.h:34
+#. This is "the search expression" (noun)
+#: ../plugins/search/anjuta-search.ui.h:35
 msgid "Search Expression:"
 msgstr "�ิ�������หา:"
 
-#: ../plugins/search/anjuta-search.ui.h:35
+#: ../plugins/search/anjuta-search.ui.h:36
 msgid "Search In:"
 msgstr "���หา��:"
 
-#: ../plugins/search/anjuta-search.ui.h:36
+#: ../plugins/search/anjuta-search.ui.h:37
 msgid "Search Recursively"
 msgstr "���หา�����ร��อรีย�อย��วย"
 
-#: ../plugins/search/anjuta-search.ui.h:37
+#: ../plugins/search/anjuta-search.ui.h:38
 msgid "Search Target"
 msgstr "���าหมาย�าร���หา"
 
-#: ../plugins/search/anjuta-search.ui.h:38
+#. User can select variables that contain lists of files, so this is a combined noun
+#: ../plugins/search/anjuta-search.ui.h:40
+msgid "Search variable"
+msgstr "�ัว��ร�อ��าร���หา"
+
+#: ../plugins/search/anjuta-search.ui.h:41
 msgid "Setting"
 msgstr "�าร�ำห����า"
 
 #: ../plugins/search/plugin.c:68
-msgid "_Find..."
-msgstr "_หา..."
+msgid "_Findâ?¦"
+msgstr "_หา�"
 
 #: ../plugins/search/plugin.c:69
 msgid "Search for a string or regular expression in the editor"
@@ -7909,8 +8044,8 @@ msgid "Find _Previous"
 msgstr "หา_��อ�ห��า"
 
 #: ../plugins/search/plugin.c:78
-msgid "Find and R_eplace..."
-msgstr "หา�ละ�_���ี�..."
+msgid "Find and R_eplaceâ?¦"
+msgstr "หา�ละ�_���ี��"
 
 #: ../plugins/search/plugin.c:80
 msgid ""
@@ -7922,16 +8057,16 @@ msgid "Search and Replace"
 msgstr "���หา�ละ����ี�"
 
 #: ../plugins/search/plugin.c:85
-msgid "Fin_d in Files..."
-msgstr "_หา�����ม..."
+msgid "Fin_d in Filesâ?¦"
+msgstr "_หา�����ม�"
 
 #: ../plugins/search/plugin.c:86
 msgid "Search for a string in multiple files or directories"
 msgstr "���หาส�ริ���หลาย� ���มหรือ���ร��อรี"
 
 #: ../plugins/search/plugin.c:102
-msgid "Searching..."
-msgstr "�าร���หา..."
+msgid "Searchingâ?¦"
+msgstr "�าร���หา�"
 
 #: ../plugins/search/search_preferences.c:44
 msgid "Basic Search"
@@ -8029,50 +8164,50 @@ msgid_plural "%d matches have been replaced."
 msgstr[0] "����ี��� %d �ห��"
 
 #: ../plugins/search/search-replace.c:1298
-msgid "Unable to build user interface for Search And Replace"
+msgid "Unable to build user interface for Search and Replace"
 msgstr "�ม�สามาร�สร�า�ส�ว��ิ���อ�ู����สำหรั��ล�อ�����อ� \"���หา�ละ����ี�\""
 
-#: ../plugins/sourceview/sourceview.c:364
+#: ../plugins/sourceview/sourceview.c:366
 #, c-format
 msgid ""
-"The file '%s' on the disk is more recent than the current buffer.\n"
+"The file \"%s\" on the disk is more recent than the current buffer.\n"
 "Do you want to reload it?"
 msgstr ""
-"���ม '%s' ���ิส���หม��ว�า�ั���อร��ั��ุ�ั�\n"
-"�ุ���อ��าร�รีย��หม�หรือ�ม�?"
+"���ม \"%s\" ���ิส���หม��ว�า�ั���อร��ั��ุ�ั�\n"
+"�ุ���อ��าร�รีย�อ�า��หม�หรือ�ม�?"
 
-#: ../plugins/sourceview/sourceview.c:401
+#: ../plugins/sourceview/sourceview.c:403
 #, c-format
 msgid ""
-"The file '%s' has been deleted on the disk.\n"
+"The file \"%s\" has been deleted on the disk.\n"
 "Do you want to close it?"
 msgstr ""
-"���ม '%s' �ู�ล�ออ��า��ิส�����ล�ว\n"
+"���ม \"%s\" �ู�ล�ออ��า��ิส�����ล�ว\n"
 "�ุ���อ��าร�ิ����มหรือ�ม�?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:438
+#: ../plugins/sourceview/sourceview.c:440
 #, c-format
 msgid "Could not open %s: %s"
 msgstr "�ม�สามาร���ิ� %s: %s"
 
-#: ../plugins/sourceview/sourceview.c:492
+#: ../plugins/sourceview/sourceview.c:494
 #, c-format
-msgid "The file '%s' is read-only! Edit anyway?"
-msgstr "���ม '%s' อ�า�อย�า������ียว! ยื�ยั��ี��ะ�����หรือ�ม�?"
+msgid "The file \"%s\" is read-only! Edit anyway?"
+msgstr "���ม \"%s\" อ�า�อย�า������ียว! ยื�ยั��ี��ะ�����หรือ�ม�?"
 
 #. Could not open <filename>: <error message>
-#: ../plugins/sourceview/sourceview.c:551
+#: ../plugins/sourceview/sourceview.c:553
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "�ม�สามาร��ั��ึ� %s: %s"
 
-#: ../plugins/sourceview/sourceview-io.c:274
+#: ../plugins/sourceview/sourceview-io.c:273
 #, c-format
 msgid "Could not save file because filename not yet specified"
 msgstr "�ม�สามาร��ั��ึ����ม�����ราะ�ื�อ���มยั��ม����ระ�ุ"
 
-#: ../plugins/sourceview/sourceview-io.c:504
+#: ../plugins/sourceview/sourceview-io.c:503
 #, c-format
 msgid "New file %d"
 msgstr "���ม�หม� %d"
@@ -8090,113 +8225,117 @@ msgid "Create backup files"
 msgstr "สร�า����มสำรอ�"
 
 #: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:4
+msgid "Enable autocompletion"
+msgstr "��ิ�����า��าร��ิม���มอั���มั�ิ"
+
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
 msgid "Font"
 msgstr "���อั�ษร"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:5
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
 msgid "Font:"
 msgstr "���อั�ษร:"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:6
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
 msgid "Highlight current line"
 msgstr "�����รร�ั��ั��ุ�ั�"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:7
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
 msgid "Highlight matching brackets"
 msgstr "����ว��ล���ี����า�ู�"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:8
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
 msgid "Highlight syntax"
 msgstr "�����วยา�ร��"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:9
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:10
 msgid "Indentation and auto-format options"
 msgstr "�ัว�ลือ��ารร��ย�อห��า�ละ�าร�ั�รู����อั���มั�ิ"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:11
-msgid "Print Linenumbers"
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+msgid "Print line numbers"
 msgstr "�ิม���ล��รร�ั�"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:12
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
 msgid "Print options"
 msgstr "�ัว�ลือ�สำหรั��าร�ิม��"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:13
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
 msgid "Print page footer"
 msgstr "�ิม����าย�ระ�าษ"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:14
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
 msgid "Print page header"
 msgstr "�ิม��หัว�ระ�าษ"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:15
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
 msgid "Printing"
 msgstr "�าร�ิม��"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:16
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
 msgid "Right margin position in characters"
 msgstr "�ำ�ห����อ��วา�����ำ�ว��ัวอั�ษร"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:17
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
 msgid "Show line numbers"
 msgstr "�ส���ล��รร�ั�"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:18
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
 msgid "Show marks"
 msgstr "�ส���อ��ำ��รื�อ�หมาย"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:19
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
 msgid "Show right margin"
 msgstr "�ส���ั��ห��า�วา"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:20
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
 msgid "Tab size in spaces:"
 msgstr "��า����������ำ�ว���อ�ว�า�:"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:21
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
 msgid "Use tabs for indentation"
 msgstr "����������ารร��ย�อห��า"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:22
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
 msgid "Use theme font"
 msgstr "������อั�ษร�อ��ีม"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:23
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
 #: ../src/anjuta-app.c:493 ../src/anjuta-app.c:498
 msgid "View"
 msgstr "มุมมอ�"
 
-#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:24
+#: ../plugins/sourceview/anjuta-editor-sourceview.ui.h:25
 msgid "Wrap long lines to fit on paper"
 msgstr "�ั��รร�ั�ยาว�ห��อ�ีห��า�ระ�าษ"
 
-#: ../plugins/starter/plugin.c:50 ../plugins/starter/starter.c:344
+#: ../plugins/starter/plugin.c:50 ../plugins/starter/starter.c:349
 #: ../plugins/starter/anjuta-starter.plugin.in.h:1
 msgid "Starter"
 msgstr "��รื�อ�มือ�รีย��ำ�า�"
 
-#: ../plugins/starter/starter.c:385
+#: ../plugins/starter/starter.c:390
 msgid "Create File/Project"
 msgstr "สร�า����ม/��ร��าร"
 
-#: ../plugins/starter/starter.c:419
+#: ../plugins/starter/starter.c:424
 msgid "Recent Projects"
 msgstr "��ร��ารล�าสุ�"
 
-#: ../plugins/starter/starter.c:450
+#: ../plugins/starter/starter.c:455
 msgid "Links"
 msgstr "ลิ���"
 
-#: ../plugins/starter/starter.c:469
+#: ../plugins/starter/starter.c:474
 msgid "Anjuta Home Page"
 msgstr "�ว�������อ��อ��ู�า"
 
-#: ../plugins/starter/starter.c:475
+#: ../plugins/starter/starter.c:480
 msgid "Anjuta Manual"
 msgstr "�ู�มือ�อ��ู�า"
 
-#: ../plugins/starter/starter.c:481
-msgid "Gnome Online API Documentation"
+#: ../plugins/starter/starter.c:486
+msgid "GNOME Online API Documentation"
 msgstr "�อ�สาร API ออ��ล���อ� GNOME"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:1
@@ -8284,82 +8423,86 @@ msgid "Repository authorization"
 msgstr "�าร�รว�สอ�สิ��ิ��อ��ลั�"
 
 #: ../plugins/subversion/anjuta-subversion.ui.h:36
+msgid "Retrieving status��"
+msgstr "�ำลั��ึ���อมูลส�า�ะ��"
+
+#: ../plugins/subversion/anjuta-subversion.ui.h:37
 msgid "Revert Changes"
 msgstr "�รีย��าร��ลี�ย���ล��ื�"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:38
+#: ../plugins/subversion/anjuta-subversion.ui.h:39
 msgid "Save open files before diffing"
 msgstr "�ั��ึ����ม�ี���ิ���อ� diff"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:39
+#: ../plugins/subversion/anjuta-subversion.ui.h:40
 msgid "Second Path:"
 msgstr "�า��ี�สอ�:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:40
+#: ../plugins/subversion/anjuta-subversion.ui.h:41
 msgid "Select Changes to Revert:"
 msgstr "�ลือ��าร��ลี�ย���ล��ี��ะย�อ��ื�:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:44
+#: ../plugins/subversion/anjuta-subversion.ui.h:45
 msgid "Source/Destination Paths:"
 msgstr "�า�����า�/�ลาย�า�:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:45
+#: ../plugins/subversion/anjuta-subversion.ui.h:46
 msgid "Source:"
 msgstr "����า�:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:46
+#: ../plugins/subversion/anjuta-subversion.ui.h:47
 msgid "Start Revision:"
 msgstr "��ั�������ริ�ม���:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:47
+#: ../plugins/subversion/anjuta-subversion.ui.h:48
 msgid "Subversion Options"
 msgstr "�ัว�ลือ��อ� subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:48
+#: ../plugins/subversion/anjuta-subversion.ui.h:49
 msgid "Subversion Preferences"
 msgstr "�รั����� Subversion"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:49
+#: ../plugins/subversion/anjuta-subversion.ui.h:50
 msgid "Switch to branch/tag"
 msgstr "สลั���������/����"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:50
+#: ../plugins/subversion/anjuta-subversion.ui.h:51
 msgid "Trust server"
 msgstr "��ื�อ�ือ��ิร���วอร�"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:51
+#: ../plugins/subversion/anjuta-subversion.ui.h:52
 msgid "Update file/directory"
 msgstr "�รั���อมูล���ม/���ร��อรี"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:52
+#: ../plugins/subversion/anjuta-subversion.ui.h:53
 msgid "Use first path"
 msgstr "����า��ร�"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:53
+#: ../plugins/subversion/anjuta-subversion.ui.h:54
 msgid "Use previous message"
 msgstr "�����อ�วาม�ี��ล�ว"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:56
+#: ../plugins/subversion/anjuta-subversion.ui.h:57
 msgid "View Log"
 msgstr "�ู�ูม"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:57
+#: ../plugins/subversion/anjuta-subversion.ui.h:58
 msgid "View Selected Revision"
 msgstr "�ู��ั�������ี��ลือ�"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:59
+#: ../plugins/subversion/anjuta-subversion.ui.h:60
 msgid "Whole Project"
 msgstr "�ั����ร��าร"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:61
+#: ../plugins/subversion/anjuta-subversion.ui.h:62
 msgid "Working Copy"
 msgstr "�ุ�สำ��า�ำ�า�"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:62
+#: ../plugins/subversion/anjuta-subversion.ui.h:63
 msgid "Working Copy Path:"
 msgstr "�า��ุ�สำ��า�ำ�า�:"
 
-#: ../plugins/subversion/anjuta-subversion.ui.h:63
+#: ../plugins/subversion/anjuta-subversion.ui.h:64
 msgid "realm"
 msgstr "�อ����"
 
@@ -8390,8 +8533,8 @@ msgstr "Commit �าร��ลี�ย���ล��อ��ุ��
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:84 ../plugins/subversion/plugin.c:167
-msgid "_Revert..."
-msgstr "ย�อ�_�ื�..."
+msgid "_Revertâ?¦"
+msgstr "ย�อ�_�ื��"
 
 #. Display label
 #. short-cut
@@ -8402,8 +8545,8 @@ msgstr "�รีย��ื��าร��ลี�ย���ล���
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:92
-msgid "_Resolve Conflicts..."
-msgstr "�_����อ�ั��ย��..."
+msgid "_Resolve Conflictsâ?¦"
+msgstr "�_����อ�ั��ย���"
 
 #. Display label
 #. short-cut
@@ -8414,20 +8557,20 @@ msgstr "�����อ�ั��ย�����ุ�สำ��า�
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:100 ../plugins/subversion/plugin.c:159
-msgid "_Update..."
-msgstr "_�รั���อมูล..."
+msgid "_Updateâ?¦"
+msgstr "_�รั���อมูล�"
 
 #. Display label
 #. short-cut
 #: ../plugins/subversion/plugin.c:102 ../plugins/subversion/plugin.c:161
-msgid "Sync your local copy with the Subversion tree"
+msgid "Syncronize your local copy with the Subversion tree"
 msgstr "�รั���อมูล����รื�อ��อ��ุ��ห��ร��ั� Subversion tree"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:108
-msgid "Copy Files/Folders..."
-msgstr "�ั�ลอ����ม/��ล��อร�..."
+msgid "Copy Files/Foldersâ?¦"
+msgstr "�ั�ลอ����ม/��ล��อร��"
 
 #. Display label
 #. short-cut
@@ -8438,8 +8581,8 @@ msgstr "�ั�ลอ����ม/��ล��อร����ลั
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:116
-msgid "Switch to a Branch/Tag..."
-msgstr "สลั�������/����..."
+msgid "Switch to a Branch/Tagâ?¦"
+msgstr "สลั�������/�����"
 
 #. Display label
 #. short-cut
@@ -8450,8 +8593,8 @@ msgstr "สลั��ุ�สำ��า����รื�อ����
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:124
-msgid "Merge..."
-msgstr "�สา�..."
+msgid "Mergeâ?¦"
+msgstr "�สา��"
 
 #. Display label
 #. short-cut
@@ -8462,8 +8605,8 @@ msgstr "�สา��าร��ลี�ย���ล����า��
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:132 ../plugins/subversion/plugin.c:191
-msgid "_View Log..."
-msgstr "_�ู�ูม..."
+msgid "_View Logâ?¦"
+msgstr "�ู�ู_ม�"
 
 #. Display label
 #. short-cut
@@ -8474,8 +8617,8 @@ msgstr "�ู�ระวั�ิ���ม"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:140
-msgid "_Diff..."
-msgstr "_Diff..."
+msgid "_Diffâ?¦"
+msgstr "_Diffâ?¦"
 
 #. Display label
 #. short-cut
@@ -8486,14 +8629,14 @@ msgstr "Diff tree ����รื�อ��ั��ลั�"
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:199
-msgid "Copy..."
-msgstr "�ั�ลอ�..."
+msgid "Copyâ?¦"
+msgstr "�ั�ลอ��"
 
 #. Action name
 #. Stock icon, if any
 #: ../plugins/subversion/plugin.c:207
-msgid "Diff..."
-msgstr "Diff..."
+msgid "Diffâ?¦"
+msgstr "Diffâ?¦"
 
 #: ../plugins/subversion/plugin.c:488
 msgid "Subversion operations"
@@ -8516,8 +8659,8 @@ msgid "Subversion: Commit complete."
 msgstr "Subversion: commit �สร��สม�ูร��"
 
 #: ../plugins/subversion/subversion-commit-dialog.c:123
-msgid "Subversion: Committing changes to the repository..."
-msgstr "Subversion: �ำลั� commit �าร��ลี�ย���ล����ี��ลั�..."
+msgid "Subversion: Committing changes to the repositoryâ?¦"
+msgstr "Subversion: �ำลั� commit �าร��ลี�ย���ล����ี��ลั��"
 
 #: ../plugins/subversion/subversion-copy-dialog.c:138
 msgid "Subversion: Copy complete."
@@ -8538,8 +8681,8 @@ msgstr "[Head/�ุ�สำ��า�ี��ำ�า�]"
 #: ../plugins/subversion/subversion-diff-dialog.c:61
 #: ../plugins/subversion/subversion-log-dialog.c:426
 #: ../plugins/subversion/subversion-log-dialog.c:493
-msgid "Subversion: Retrieving diff..."
-msgstr "Subversion: �ำลั��ึ� diff..."
+msgid "Subversion: Retrieving diffâ?¦"
+msgstr "Subversion: �ำลั��ึ� diff�"
 
 #: ../plugins/subversion/subversion-log-dialog.c:119
 msgid "Diff"
@@ -8554,16 +8697,16 @@ msgid "Short Log"
 msgstr "�ูม���สั��"
 
 #: ../plugins/subversion/subversion-log-dialog.c:257
-msgid "Subversion: Retrieving log..."
-msgstr "Subversion: �ำลั��ึ��ูม..."
+msgid "Subversion: Retrieving logâ?¦"
+msgstr "Subversion: �ำลั��ึ��ูม�"
 
 #: ../plugins/subversion/subversion-log-dialog.c:309
 msgid "Subversion: File retrieved."
 msgstr "Subversion: �ึ����ม�สร���ล�ว"
 
 #: ../plugins/subversion/subversion-log-dialog.c:351
-msgid "Subversion: Retrieving file..."
-msgstr "Subversion: �ำลั��ึ����ม..."
+msgid "Subversion: Retrieving fileâ?¦"
+msgstr "Subversion: �ำลั��ึ����ม�"
 
 #: ../plugins/subversion/subversion-merge-dialog.c:38
 msgid "Subversion: Merge complete."
@@ -8705,64 +8848,64 @@ msgstr "สู�หาย: %s"
 msgid "Obstructed: %s"
 msgstr "�ู��ี��วา�: %s"
 
-#: ../plugins/symbol-db/plugin.c:313
+#: ../plugins/symbol-db/plugin.c:317
 msgid "Tag De_claration"
 msgstr "�าร�ระ�าศ�_���"
 
-#: ../plugins/symbol-db/plugin.c:315
-msgid "Goto symbol declaration"
+#: ../plugins/symbol-db/plugin.c:319
+msgid "Go to symbol declaration"
 msgstr "��ยั��าร�ระ�าศสั�ลั�ษ��"
 
 #. Translators: Go to the line where the tag is implemented
-#: ../plugins/symbol-db/plugin.c:322
+#: ../plugins/symbol-db/plugin.c:326
 msgid "Tag _Implementation"
 msgstr "�_�ื�อหา����"
 
-#: ../plugins/symbol-db/plugin.c:324
-msgid "Goto symbol definition"
+#: ../plugins/symbol-db/plugin.c:328
+msgid "Go to symbol definition"
 msgstr "��ยั��ัว��ื�อหา�อ�สั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:331
-msgid "_Find Symbol..."
-msgstr "_หาสั�ลั�ษ��..."
+#: ../plugins/symbol-db/plugin.c:335
+msgid "_Find Symbolâ?¦"
+msgstr "_หาสั�ลั�ษ���"
 
-#: ../plugins/symbol-db/plugin.c:332
+#: ../plugins/symbol-db/plugin.c:336
 msgid "Find Symbol"
 msgstr "หาสั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:1170
+#: ../plugins/symbol-db/plugin.c:1184
 #, c-format
-msgid "%s: Generating inheritances..."
-msgstr "%s: �ำลั�สร�า���ร�สร�า��ารสื��อ��ุ�สม�ั�ิ..."
+msgid "%s: Generating inheritancesâ?¦"
+msgstr "%s: �ำลั�สร�า���ร�สร�า��ารสื��อ��ุ�สม�ั�ิ�"
 
-#: ../plugins/symbol-db/plugin.c:1175
+#: ../plugins/symbol-db/plugin.c:1189
 #, c-format
 msgid "%s: %d files scanned out of %d"
 msgstr "%s: ส����ล�ว %d �า� %d ���ม"
 
-#: ../plugins/symbol-db/plugin.c:1206
+#: ../plugins/symbol-db/plugin.c:1220
 #, c-format
-msgid "Generating inheritances..."
-msgstr "�ำลั�สร�า���ร�สร�า��ารสื��อ��ุ�สม�ั�ิ..."
+msgid "Generating inheritancesâ?¦"
+msgstr "�ำลั�สร�า���ร�สร�า��ารสื��อ��ุ�สม�ั�ิ�"
 
-#: ../plugins/symbol-db/plugin.c:1208
+#: ../plugins/symbol-db/plugin.c:1222
 #, c-format
 msgid "%d files scanned out of %d"
 msgstr "ส����ล�ว %d �า� %d ���ม"
 
-#: ../plugins/symbol-db/plugin.c:1968
-msgid "Populating symbols' db..."
-msgstr "�ำลั���ิม��อมูล�า���อมูลสั�ลั�ษ��..."
+#: ../plugins/symbol-db/plugin.c:1990
+msgid "Populating symbol databaseâ?¦"
+msgstr "�ำลั���ิม��อมูล�า���อมูลสั�ลั�ษ���"
 
-#: ../plugins/symbol-db/plugin.c:2352 ../plugins/symbol-db/plugin.c:2480
+#: ../plugins/symbol-db/plugin.c:2378 ../plugins/symbol-db/plugin.c:2505
 msgid "Symbols"
 msgstr "สั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:2489
+#: ../plugins/symbol-db/plugin.c:2514
 msgid "SymbolDb popup actions"
 msgstr "�าร�ระ�ำ���ม�ู�ุ��ึ���อ��า���อมูลสั�ลั�ษ��"
 
-#: ../plugins/symbol-db/plugin.c:2497
+#: ../plugins/symbol-db/plugin.c:2522
 msgid "SymbolDb menu actions"
 msgstr "�าร�ระ�ำ���ม�ู�อ��า���อมูลสั�ลั�ษ��"
 
@@ -8789,121 +8932,134 @@ msgstr "�าร�ลั���ส��� glb �หม�"
 msgid "Symbol"
 msgstr "สั�ลั�ษ��"
 
+#: ../plugins/symbol-db/symbol-db-view.c:799
+msgid "Loadingâ?¦"
+msgstr "�ำลั��หล��"
+
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:1
-msgid "<b>Available API tags</b>"
-msgstr "<b>���� API �ี�มีอยู�</b>"
+msgid "Automatically scan project's packages"
+msgstr "�รว���อมูล�������อ���ร��าร��ยอั���มั�ิ"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:2
-msgid "<b>Global</b>"
-msgstr "<b>Global</b>"
+msgid "Automatically update symbols without saving file"
+msgstr "�รั���อมูลสั�ลั�ษ����ยอั���มั�ิ��ย�ม��ั��ึ����ม"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:3
-msgid "Automatically scan project's packages"
-msgstr "�รว���อมูล�������อ���ร��าร��ยอั���มั�ิ"
+msgid ""
+"Automatically update the file's symbols without saving. The update occurs "
+"after 10 seconds without keypresses by the user."
+msgstr ""
+"�รั���อมูลสั�ลั�ษ���อ����ม��ยอั���มั�ิ��ย�ม��ั��ึ� �าร�รั���อมูล�ะ��ิ��ึ��หลั��า��ี��ู�����ม����ุ�ม�� � "
+"�����วลา 10 วิ�า�ี"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:4
-msgid "Automatically update symbols without saving file"
-msgstr "�รั���อมูลสั�ลั�ษ����ยอั���มั�ิ��ย�ม��ั��ึ����ม"
+msgid "Available API tags"
+msgstr "���� API �ี�มีอยู�"
 
 #: ../plugins/symbol-db/anjuta-symbol-db.ui.h:5
-msgid "Checking if package is parseable..."
-msgstr "�ำลั��รว�สอ�ว�า������สามาร�������หรือ�ม�..."
+msgid "Checking if package is parseableâ?¦"
+msgstr "�ำลั��รว�สอ�ว�า������สามาร�������หรือ�ม��"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:6
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
 msgid "Parallel scan of project and global symbols"
 msgstr "�รว���อมูล��ร��าร�ละสั�ลั�ษ��ส�ว��ลา������า�"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:7
+#: ../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)"
+"g. Glib and GTK+ if you create a GTK+ project (may require more CPU work)"
 msgstr ""
-"�ัว�ลือ��ี���ิ�����������ริยาย�ี���ร��าร�ี��ุ���ิ�อยู���อ���� ���� glib �ละ gtk+ "
-"��า�ุ�สร�า���ร��าร Gtk+ (อา��ำ�ห��ี�ียู�ำ�า�ห�ั��ึ��)"
+"�ัว�ลือ��ี���ิ�����������ริยาย�ี���ร��าร�ี��ุ���ิ�อยู���อ���� ���� GLib �ละ GTK+ "
+"��า�ุ�สร�า���ร��าร GTK+ (อา��ำ�ห��ี�ียู�ำ�า�ห�ั��ึ��)"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:8
+#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
 msgid ""
 "This option means that the global system packages will be scanned "
-"contemporary with the project's ones"
+"simultaneously with the project's ones"
 msgstr "�ัว�ลือ��ี��ะ�รว���อมูล������ส�ว��ลา��ร�อม � �ั��อ���ร��าร"
 
-#: ../plugins/symbol-db/anjuta-symbol-db.ui.h:9
-msgid ""
-"Update automatically the file's symbols without saving. The update occurs "
-"after 10 seconds of no keypress by user."
-msgstr ""
-"�รั���อมูลสั�ลั�ษ���อ����ม��ยอั���มั�ิ��ย�ม��ั��ึ� �าร�รั���อมูล�ะ��ิ��ึ��หลั��า��ี��ู�����ม����ุ�ม�� � "
-"�����วลา 10 วิ�า�ี"
-
-#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:1
-msgid "<b>Terminal options</b>"
-msgstr "<b>�ัว�ลือ�สำหรั���อร�มิ�ัล</b>"
+#: ../plugins/terminal/anjuta-terminal-plugin.ui.h:2
+msgid "Terminal options"
+msgstr "�ัว�ลือ�สำหรั���อร�มิ�ัล"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:3
-msgid "Use GNOME terminal profile:"
+msgid "Use GNOME Terminal profile:"
 msgstr "�����ร��ล���อร�มิ�ัล�อ� GNOME:"
 
 #: ../plugins/terminal/anjuta-terminal-plugin.ui.h:4
 msgid "Use currently selected profile in GNOME terminal"
 msgstr "�����ร��ล��ี��ลือ��ว�����อร�มิ�ัล GNOME"
 
-#: ../plugins/terminal/terminal.c:701
+#: ../plugins/terminal/terminal.c:626
+msgid "Ctrl-C"
+msgstr "Ctrl-C"
+
+#: ../plugins/terminal/terminal.c:634
+msgid "Ctrl-X"
+msgstr "Ctrl-X"
+
+#: ../plugins/terminal/terminal.c:642
+msgid "Ctrl-Z"
+msgstr "Ctrl-Z"
+
+#: ../plugins/terminal/terminal.c:781
 msgid "terminal operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���อร�มิ�ัล"
 
-#: ../plugins/terminal/terminal.c:719 ../plugins/terminal/terminal.c:886
-#: ../plugins/terminal/terminal.c:939
+#: ../plugins/terminal/terminal.c:799 ../plugins/terminal/terminal.c:968
+#: ../plugins/terminal/terminal.c:1021
 #: ../plugins/terminal/anjuta-terminal.plugin.in.h:1
 msgid "Terminal"
 msgstr "��อร�มิ�ัล"
 
-#: ../plugins/tools/anjuta-tools.ui.h:1
-msgid "<b>Tools</b>"
-msgstr "<b>��รื�อ�มือ</b>"
-
-#: ../plugins/tools/anjuta-tools.ui.h:3
+#: ../plugins/tools/anjuta-tools.ui.h:2
 msgid "Command:"
 msgstr "�ำสั��:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:4
+#: ../plugins/tools/anjuta-tools.ui.h:3
 msgid "Edit as script"
 msgstr "�����ส�ริ���"
 
-#: ../plugins/tools/anjuta-tools.ui.h:5
+#: ../plugins/tools/anjuta-tools.ui.h:4
 msgid "Edit command as script in Anjuta on close"
 msgstr "������ำสั�������ส�ริ������อ��ู�า�มื�อ�ิ�"
 
-#: ../plugins/tools/anjuta-tools.ui.h:8
+#: ../plugins/tools/anjuta-tools.ui.h:7
 msgid "Parameters:"
 msgstr "�ารามิ��อร�:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:10
+#: ../plugins/tools/anjuta-tools.ui.h:9
 msgid "Save all files"
 msgstr "�ั��ึ����ม�ั��หม�"
 
-#: ../plugins/tools/anjuta-tools.ui.h:11
+#: ../plugins/tools/anjuta-tools.ui.h:10
 msgid "Short cut:"
 msgstr "�ุ�มลั�:"
 
 #. This is the Unix stderr, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.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.ui.h:15
+#: ../plugins/tools/anjuta-tools.ui.h:14
 msgid "Standard input:"
 msgstr "อิ��ุ�มา�ร�า�:"
 
 #. This is the standard Unis stdout, see http://en.wikipedia.org/wiki/Standard_streams
-#: ../plugins/tools/anjuta-tools.ui.h:17
+#: ../plugins/tools/anjuta-tools.ui.h:16
 msgid "Standard output:"
 msgstr "�อา���ุ�มา�ร�า�:"
 
-#: ../plugins/tools/anjuta-tools.ui.h:18
+#: ../plugins/tools/anjuta-tools.ui.h:17
 msgid "Tool Editor"
 msgstr "��รื�อ�มือ�������รื�อ�มือ"
 
+#: ../plugins/tools/anjuta-tools.ui.h:18 ../plugins/tools/plugin.c:256
+#: ../plugins/tools/plugin.c:263 ../plugins/tools/anjuta-tools.plugin.in.h:1
+msgid "Tools"
+msgstr "��รื�อ�มือ"
+
 #: ../plugins/tools/anjuta-tools.ui.h:19
 msgid "Variable list"
 msgstr "ราย�ื�อ�ัว��ร"
@@ -8913,8 +9069,8 @@ msgid "Working directory:"
 msgstr "���ร��อรี�ำ�า�:"
 
 #: ../plugins/tools/anjuta-tools.ui.h:21
-msgid "_Variable..."
-msgstr "_�ัว��ร..."
+msgid "_Variableâ?¦"
+msgstr "_�ัว��ร�"
 
 #: ../plugins/tools/dialog.c:177
 #, c-format
@@ -8964,8 +9120,8 @@ msgid "Unable to edit script"
 msgstr "�ม�สามาร������ส�ริ���"
 
 #: ../plugins/tools/editor.c:1044
-msgid "New accelerator..."
-msgstr "�ีย���ว��หม�..."
+msgid "New acceleratorâ?¦"
+msgstr "�ีย���ว��หม��"
 
 #: ../plugins/tools/execute.c:314
 #, c-format
@@ -8991,8 +9147,8 @@ msgstr "(error)"
 #. Display the name of the command
 #: ../plugins/tools/execute.c:469
 #, c-format
-msgid "Running command: %s...\n"
-msgstr "�ำลั��รีย��ำสั��: %s...\n"
+msgid "Running command: %sâ?¦\n"
+msgstr "�ำลั��รีย��ำสั��: %s�\n"
 
 #: ../plugins/tools/execute.c:509
 #, c-format
@@ -9000,12 +9156,12 @@ msgid "Completed unsuccessfully with status code %d\n"
 msgstr "�ม�สำ�ร����วยรหัสส�า�ะ %d\n"
 
 #: ../plugins/tools/execute.c:629
-msgid "Unable to create a buffer, command aborted"
-msgstr "สร�า��ั���อร��ม���� �ำสั���ู�ย��ลิ�"
+msgid "Unable to create a buffer: command aborted"
+msgstr "สร�า��ั���อร��ม����: �ำสั���ู�ย��ลิ�"
 
 #: ../plugins/tools/execute.c:641
-msgid "No document currently open, command aborted"
-msgstr "�ม�มี���ม��ิ�อยู�����ะ�ี� �ำสั���ู�ย��ลิ�"
+msgid "No document currently open: command aborted"
+msgstr "�ม�มี���ม��ิ�อยู�����ะ�ี�: �ำสั���ู�ย��ลิ�"
 
 #: ../plugins/tools/execute.c:1019
 #, c-format
@@ -9034,11 +9190,6 @@ msgstr "�ม�สามาร���ิ� %s ��ื�อ��ีย
 msgid "Tool operations"
 msgstr "�าร�ระ�ำ��ี�ยว�ั���รื�อ�มือ"
 
-#: ../plugins/tools/plugin.c:256 ../plugins/tools/plugin.c:263
-#: ../plugins/tools/anjuta-tools.plugin.in.h:1
-msgid "Tools"
-msgstr "��รื�อ�มือ"
-
 #: ../plugins/tools/variable.c:84
 msgid "Project root URI"
 msgstr "URI รา��อ���ร��าร"
@@ -9156,7 +9307,7 @@ msgid "Replace buffer"
 msgstr "����ี��ั���อร�"
 
 #: ../plugins/tools/tool.c:86
-msgid "Insert in buffer"
+msgid "Insert into buffer"
 msgstr "��ร����ั���อร�"
 
 #: ../plugins/tools/tool.c:87
@@ -9196,9 +9347,9 @@ msgstr "สายอั��ระ"
 msgid "Copyright (c) Naba Kumar"
 msgstr "Copyright (c) Naba Kumar"
 
-#: ../src/anjuta.c:428
-msgid "Loaded Session..."
-msgstr "�หล�วาระ�ล�ว..."
+#: ../src/anjuta.c:424
+msgid "Loaded Sessionâ?¦"
+msgstr "�หล�วาระ�ล�ว�"
 
 #: ../src/anjuta-actions.h:23
 msgid "_File"
@@ -9325,7 +9476,7 @@ msgid "About External _Plugins"
 msgstr "��ี�ยว�ั��ลั��อิ�ภาย_�อ�"
 
 #: ../src/anjuta-actions.h:96
-msgid "About third party Anjuta plugins"
+msgid "About third-party Anjuta plugins"
 msgstr "��ี�ยว�ั��ลั��อิ� third party �อ��อ��ู�า"
 
 #: ../src/anjuta-app.c:489
@@ -9356,11 +9507,11 @@ msgid "WIDTHxHEIGHT+XOFF+YOFF"
 msgstr "WIDTHxHEIGHT+XOFF+YOFF"
 
 #: ../src/main.c:70
-msgid "Do not show the splashscreen"
+msgid "Do not show the splash screen"
 msgstr "�ม��ส��รู�����ิล"
 
 #: ../src/main.c:76
-msgid "Start a new instance and do not open the file in a existing"
+msgid "Start a new instance and do not open the file in an existing instance"
 msgstr "��ิ�ห��า��า��หม� �ละ�ม���ิ����ม��ห��า��า���ิม�ี�มีอยู�"
 
 #: ../src/main.c:82
@@ -9372,14 +9523,14 @@ msgid "Do not open last project and files on startup"
 msgstr "�ม���อ���ิ���ร��าร�ละ���มล�าสุ���ะ�ริ�ม�ำ�า�"
 
 #: ../src/main.c:94
-msgid "Shutdown anjuta properly releasing all resources (for debugging)"
-msgstr "�าร�ิ��อ��ู�าอย�า��ู���อ� �าร�ล�อย�รั�ยา�ร�ั��หม�(สำหรั��าร�ี�ั��)"
+msgid "Shut down Anjuta properly, releasing all resources (for debugging)"
+msgstr "�ิ��อ��ู�า�ห��รีย�ร�อย �ร�อม�ล�อย�ื��รั�ยา�ร�ั��หม� (สำหรั��าร�ี�ั��)"
 
 #: ../src/main.c:156
 msgid "- Integrated Development Environment"
 msgstr "- �ุ���รื�อ�มือ�ั��า�����สร��"
 
-#: ../src/main.c:216
+#: ../src/main.c:232
 msgid "Anjuta"
 msgstr "�อ��ู�า"
 
@@ -9412,8 +9563,8 @@ msgstr "�ม���อ��หล�วาระล�าสุ���ะ
 msgid "Dock switcher style:"
 msgstr "รู������รื�อ�สลั� dock:"
 
-#: ../src/preferences.ui.h:11
-msgid "Gnome toolbar setting"
+#: ../src/preferences.ui.h:10
+msgid "GNOME toolbar setting"
 msgstr "�าม��า�ั�������รื�อ�มือ�อ� GNOME"
 
 #: ../src/preferences.ui.h:12
@@ -9429,7 +9580,7 @@ msgid "Project Defaults"
 msgstr "��า�ริยาย�อ���ร��าร"
 
 #: ../src/preferences.ui.h:15
-msgid "Select projects directory"
+msgid "Select project directory"
 msgstr "�ลือ����ร��อรี��ร��าร"
 
 #: ../src/preferences.ui.h:16
@@ -9467,14 +9618,14 @@ msgstr "�ม���อ��ส���ำ��ือ���า�ม�
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:1
 msgid "Add '(' after function call autocompletion"
-msgstr "��ิ�ม '(' หลั���ิม���ม�าร�รีย��ั���ั���ยอั���มั�ิ"
+msgstr "��ิ�ม '(' หลั���ิม���ม�าร�รีย��ั����ั���ยอั���มั�ิ"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:2
 msgid "Add a space after function call autocompletion"
-msgstr "��ิ�ม��อ�ว�า�หลั���ิม���ม�าร�รีย��ั���ั���ยอั���มั�ิ"
+msgstr "��ิ�ม��อ�ว�า�หลั���ิม���ม�าร�รีย��ั����ั���ยอั���มั�ิ"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:3
-msgid "Autocomplete"
+msgid "Auto-complete"
 msgstr "��ิม���ม�ำอั���มั�ิ"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:4
@@ -9518,10 +9669,11 @@ msgid "Line up parentheses"
 msgstr "�ั�ว��ล���ห��ร��ั�"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:14
-msgid "Parenthese indentation"
+msgid "Parenthesis indentation"
 msgstr "�ารร��ย�อห��าว��ล��"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.ui.h:15
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:7
 msgid "Show calltips"
 msgstr "�ส���ำ��ะ�ำ�าร�รีย�"
 
@@ -9533,39 +9685,35 @@ msgstr "�ารร��ย�อห��า����ลา�"
 msgid "Statement indentation size in spaces:"
 msgstr "��า��ารร��ย�อห��า��อย��ล���ห��วย�ำ�ว���อ�ว�า�:"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1921
-msgid "_AutoComplete"
-msgstr "�_�ิม���ม�ำอั���มั�ิ"
-
-#: ../plugins/language-support-cpp-java/plugin.c:1922
-msgid "AutoComplete the current word"
-msgstr "��ิม���ม�ำ�ั��ุ�ั���ยอั���มั�ิ"
-
-#: ../plugins/language-support-cpp-java/plugin.c:1928
-msgid "Auto Indent"
+#: ../plugins/language-support-cpp-java/plugin.c:1884
+msgid "Auto-Indent"
 msgstr "ร��ย�อห��าอั���มั�ิ"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1929
-msgid "Auto indent current line or selection based on indentation settings"
-msgstr "ร���รร�ั��ั��ุ�ั�หรือ��อ�วาม�ี��ลือ���ยอั���มั� �ึ��อยู��ั���า�ั���ารร��ย�อห��า"
+#: ../plugins/language-support-cpp-java/plugin.c:1885
+msgid "Auto-indent current line or selection based on indentation settings"
+msgstr "ร���รร�ั��ั��ุ�ั�หรือ��อ�วาม�ี��ลือ�อยู���ยอั���มั�ิ �ึ��อยู��ั���า�ั���ารร��ย�อห��า"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1934
+#: ../plugins/language-support-cpp-java/plugin.c:1890
 msgid "Swap .h/.c"
 msgstr "สลั� .h/.c"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1935
-msgid "Swap c header and source files"
+#: ../plugins/language-support-cpp-java/plugin.c:1891
+msgid "Swap C header and source files"
 msgstr "สลั����มส�ว�หัว�ั��อร�สภาษา C"
 
-#: ../plugins/language-support-cpp-java/plugin.c:1978
+#: ../plugins/language-support-cpp-java/plugin.c:1932
 msgid "C++/Java Assistance"
 msgstr "��รื�อ�มือ��วย C++/Java"
 
-#: ../plugins/language-support-cpp-java/plugin.c:2071
-#: ../plugins/language-support-cpp-java/plugin.c:2080
+#: ../plugins/language-support-cpp-java/plugin.c:2025
+#: ../plugins/language-support-cpp-java/plugin.c:2034
 msgid "C/C++/Java/Vala"
 msgstr "C/C++/Java/Vala"
 
+#: ../plugins/language-support-cpp-java/cpp-java-assist.c:1021
+msgid "C/C++"
+msgstr "C/C++"
+
 #: ../plugins/sourceview/plugin.c:232 ../plugins/sourceview/plugin.c:273
 msgid "GtkSourceView Editor"
 msgstr "��รื�อ�มือ����� GtkSourceView"
@@ -9671,24 +9819,24 @@ msgid "CVS Plugin"
 msgstr "�ลั��อิ� CVS"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:1
-msgid "Import an existing autotools project to anjuta"
+msgid "Import an existing autotools project to Anjuta"
 msgstr "�ำ���า��ร��าร autotools �ี�มีอยู����า���อ��ู�า"
 
 #: ../plugins/project-import/anjuta-project-import.plugin.in.h:2
-msgid "Project From Existing Sources"
-msgstr "��ร��าร�า��อร�ส�ี�มีอยู��ล�ว"
-
-#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
 msgid "Project Import Assistant"
 msgstr "��รื�อ�มือ��วย�ำ���า��ร��าร"
 
+#: ../plugins/project-import/anjuta-project-import.plugin.in.h:3
+msgid "Project from Existing Sources"
+msgstr "��ร��าร�า��อร�ส�ี�มีอยู��ล�ว"
+
 #: ../plugins/sourceview/sourceview.plugin.in.h:1
-msgid "GtkSourceview editor"
-msgstr "��รื�อ�มือ����� GtkSourceview"
+msgid "GtkSourceView editor"
+msgstr "��รื�อ�มือ����� GtkSourceView"
 
 #: ../plugins/sourceview/sourceview.plugin.in.h:2
-msgid "The default editor based on GtkSourceview"
-msgstr "��รื�อ�มือ������ริยาย ��ย��� GtkSourceview"
+msgid "The default editor based on GtkSourceView"
+msgstr "��รื�อ�มือ������ริยาย ��ย��� GtkSourceView"
 
 #: ../plugins/starter/anjuta-starter.plugin.in.h:2
 msgid "Welcome page with most common actions."
@@ -9699,7 +9847,7 @@ msgid "C++ and Java support Plugin"
 msgstr "�ลั��อิ�รอ�รั� C++ �ละ Java"
 
 #: ../plugins/language-support-cpp-java/anjuta-language-cpp-java.plugin.in.h:2
-msgid "C++ and Java support plugin for code completion, auto indentation etc."
+msgid "C++ and Java support plugin for code completion, auto-indentation, etc."
 msgstr "�ลั��อิ�รอ�รั� C++ �ละ Java สำหรั��าร��วย��ิม���� ร��ย�อห��าอั���มั�ิ ฯลฯ"
 
 #: ../plugins/project-wizard/anjuta-project-wizard.plugin.in.h:2
@@ -9722,10 +9870,6 @@ msgstr "�ลั��อิ���รื�อ�มือสร�า��
 msgid "C++/GObject Class"
 msgstr "�ลาส C++/GObject"
 
-#: ../plugins/class-gen/anjuta-class-gen.plugin.in.h:3
-msgid "Class Generator"
-msgstr "��รื�อ�มือสร�า��ลาส"
-
 #: ../plugins/project-manager/anjuta-project-manager.plugin.in.h:1
 msgid "Project Manager"
 msgstr "��รื�อ�มือ�ั��าร��ร��าร"
@@ -9786,6 +9930,283 @@ msgstr "�����อ��� Autotools"
 msgid "Autotools backend for project manager"
 msgstr "�����อ��� Autotools สำหรั���รื�อ�มือ�ั��าร��ร��าร"
 
+#: ../plugins/js-debugger/plugin.c:122
+#, c-format
+msgid "Error: %s"
+msgstr "��อ�ิ��ลา�: %s"
+
+#: ../plugins/js-debugger/plugin.c:142
+#: ../plugins/js-debugger/debugger-js.c:546
+msgid "Error: cant bind port"
+msgstr "��อ�ิ��ลา�: �ม�สามาร� bind �อร��"
+
+#: ../plugins/js-debugger/js_debugger.plugin.in.h:1
+msgid "Anjuta JS Debugger Plugin"
+msgstr "�ลั��อิ��ี�ั�� JS �อ��อ��ู�า"
+
+#: ../plugins/language-support-js/plugin.c:332
+#: ../plugins/language-support-js/plugin.c:341
+msgid "JavaScript"
+msgstr "�าวาส�ริ���"
+
+#: ../plugins/language-support-js/plugin.c:397
+msgid "JS"
+msgstr "JS"
+
+#: ../plugins/language-support-js/js_support_plugin.plugin.in.h:1
+msgid "JS Support Plugin"
+msgstr "�ลั��อิ�รอ�รั� JS"
+
+#: ../plugins/language-support-js/js_support_plugin.plugin.in.h:2
+msgid "JavaScript Support Plugin"
+msgstr "�ลั��อิ�รอ�รั��าวาส�ริ���"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:1
+msgid "<b>JS Find dirs</b>"
+msgstr "<b>���ร��อรี���หาสำหรั� JS</b>"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:2
+msgid "Add brace after function call autocompletion"
+msgstr "��ิ�มว��ล���ี��าหลั���ิม���ม�าร�รีย��ั����ั���ยอั���มั�ิ"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:3
+msgid "Gir repository's directory:   "
+msgstr "���ร��อรี�อ��ลั� Gir:   "
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:4
+msgid "Gjs repository's directory:   "
+msgstr "���ร��อรี�อ��ลั� Gjs:   "
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:5
+msgid "Highlight missed semicolon"
+msgstr "����อั�ภา� (semicolon) �ี�หาย��"
+
+#: ../plugins/language-support-js/anjuta-language-javascript.ui.h:6
+msgid "Min character for completion "
+msgstr "�ำ�ว�อั��ระ��ำสุ��ี��ะ�ริ�ม��ิม���ม����"
+
+#~ msgid "private"
+#~ msgstr "private"
+
+#~ msgid "protected"
+#~ msgstr "protected"
+
+#~ msgid "public"
+#~ msgstr "public"
+
+#~ msgid "Up to date"
+#~ msgstr "������อมูลล�าสุ�"
+
+#~ msgid "<b>Build</b>"
+#~ msgstr "<b>�ระ�อ�สร�า�</b>"
+
+#~ msgid "<b>Configuration:</b>"
+#~ msgstr "<b>��า�ั��:</b>"
+
+#~ msgid "<b>Install</b>"
+#~ msgstr "<b>�ิ��ั��</b>"
+
+#~ msgid "Program '%s' does not exists"
+#~ msgstr "��ร��รม '%s' �ม�มีอยู�"
+
+#~ msgid "C_onfigure Project..."
+#~ msgstr "_�ั����า��ร��าร..."
+
+#~ msgid "<b>CVS Options</b>"
+#~ msgstr "<b>�ัว�ลือ�สำหรั� CVS</b>"
+
+#~ msgid "<b>Options:</b>"
+#~ msgstr "<b>�ัว�ลือ�:</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>�ัว�ลือ�</b>"
+
+#~ msgid "<b>Repository: </b>"
+#~ msgstr "<b>�ลั�: </b>"
+
+#~ msgid "<b>Debugger:</b>"
+#~ msgstr "<b>��ร��รม�ี�ั��:</b>"
+
+#~ msgid "Debugger Command..."
+#~ msgstr "�ำสั����ร��รม�ี�ั��..."
+
+#~ msgid "Pid"
+#~ msgstr "Pid"
+
+#~ msgid "Id"
+#~ msgstr "หมาย�ล�"
+
+#~ msgid "Ins_pect/Evaluate..."
+#~ msgstr "�รว�_สอ�/�ระมวล�ล..."
+
+#~ msgid "Add Watch..."
+#~ msgstr "��ิ�ม�าร���า�ู..."
+
+#~ msgid "_Print..."
+#~ msgstr "_�ิม��..."
+
+#~ msgid "recent menu label|_%d. %s"
+#~ msgstr "_%d. %s"
+
+#~ msgid "recent menu label|%d. %s"
+#~ msgstr "%d. %s"
+
+#~ msgid "_Open..."
+#~ msgstr "_��ิ�..."
+
+#~ msgid "Url:"
+#~ msgstr "Url:"
+
+#~ msgid "Advanced..."
+#~ msgstr "ระ�ั�สู�..."
+
+#~ msgid "Source coudn't be removed"
+#~ msgstr "�ม�สามาร�ล��อร�ส���"
+
+#~ msgid "<b>Tags</b>"
+#~ msgstr "<b>����:</b>"
+
+#~ msgid "Add signed off by line"
+#~ msgstr "��ิ�ม�รร�ั������ำ�ั���ย"
+
+#~ msgid "_Commit..."
+#~ msgstr "_Commit..."
+
+#~ msgid "_View log..."
+#~ msgstr "_�ู�ูม..."
+
+#~ msgid "_Push..."
+#~ msgstr "_Push..."
+
+#~ msgid "_Pull..."
+#~ msgstr "_Pull..."
+
+#~ msgid "_Add..."
+#~ msgstr "�_�ิ�ม..."
+
+#~ msgid "_Remove..."
+#~ msgstr "_ล�..."
+
+#~ msgid "_Ignore..."
+#~ msgstr "_ละ�ลย..."
+
+#~ msgid "Create patch series..."
+#~ msgstr "สร�า��ุ�ลำ�ั������..."
+
+#~ msgid "_Switch to another branch..."
+#~ msgstr "_สลั�������อื��..."
+
+#~ msgid "_Merge..."
+#~ msgstr "_�สา�..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_ล�..."
+
+#~ msgid "_Delete tag..."
+#~ msgstr "_ล�����..."
+
+#~ msgid "Unknown language of the editor \"%s\""
+#~ msgstr "�ม��รา�ภาษา�อ���รื�อ�มือ����� \"%s\""
+
+#~ msgid "n/a"
+#~ msgstr "�ม�มี��อมูล"
+
+#~ msgid "Misc"
+#~ msgstr "อื���"
+
+#~ msgid "<b>Macros:</b>"
+#~ msgstr "<b>�ม��ร:</b>"
+
+#~ msgid "Edit..."
+#~ msgstr "�����..."
+
+#~ msgid "Macros..."
+#~ msgstr "�ม��ร..."
+
+#~ msgid "_Patch..."
+#~ msgstr "�_����..."
+
+#~ msgid "<b>Project name</b>"
+#~ msgstr "<b>�ื�อ��ร��าร</b>"
+
+#~ msgid "_Select file to add..."
+#~ msgstr "�_ลือ����ม�ี��ะ��ิ�ม..."
+
+#~ msgid "Add _Group..."
+#~ msgstr "��ิ�ม_�ลุ�ม..."
+
+#~ msgid "Add _Target..."
+#~ msgstr "��ิ�ม�_��าหมาย..."
+
+#~ msgid "Add _Source File..."
+#~ msgstr "��ิ�ม���ม�อร�_ส..."
+
+#~ msgid "_Add To Project"
+#~ msgstr "�_�ิ�ม���า����ร��าร"
+
+#~ msgid "Select project type"
+#~ msgstr "�ลือ���ิ���ร��าร"
+
+#~ msgid "Create a template gtk builder interface file"
+#~ msgstr "สร�า����ม�ม����ส�ว��ิ���อ�ู�����อ� gtk builder"
+
+#~ msgid "Wx Widgets"
+#~ msgstr "Wx Widgets"
+
+#~ msgid "Run In Terminal"
+#~ msgstr "�รีย�����อร�มิ�ัล"
+
+#~ msgid "Program Parameters..."
+#~ msgstr "�ารามิ��อร��อ���ร��รม..."
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>�าร�ระ�ำ</b>"
+
+#~ msgid "<b>Parameters</b>"
+#~ msgstr "<b>�ารามิ��อร�</b>"
+
+#~ msgid "<b>Scope</b>"
+#~ msgstr "<b>�อ����</b>"
+
+#~ msgid "Searching..."
+#~ msgstr "�าร���หา..."
+
+#~ msgid "_Update..."
+#~ msgstr "_�รั���อมูล..."
+
+#~ msgid "Merge..."
+#~ msgstr "�สา�..."
+
+#~ msgid "_View Log..."
+#~ msgstr "_�ู�ูม..."
+
+#~ msgid "_Diff..."
+#~ msgstr "_Diff..."
+
+#~ msgid "Copy..."
+#~ msgstr "�ั�ลอ�..."
+
+#~ msgid "Diff..."
+#~ msgstr "Diff..."
+
+#~ msgid "_Find Symbol..."
+#~ msgstr "_หาสั�ลั�ษ��..."
+
+#~ msgid "<b>Global</b>"
+#~ msgstr "<b>Global</b>"
+
+#~ msgid "<b>Terminal options</b>"
+#~ msgstr "<b>�ัว�ลือ�สำหรั���อร�มิ�ัล</b>"
+
+#~ msgid "<b>Tools</b>"
+#~ msgstr "<b>��รื�อ�มือ</b>"
+
+#~ msgid "_Variable..."
+#~ msgstr "_�ัว��ร..."
+
+#~ msgid "GtkSourceview editor"
+#~ msgstr "��รื�อ�มือ����� GtkSourceview"
+
 #~ msgid "on_widget_signal"
 #~ msgstr "on_widget_signal"
 
@@ -9804,9 +10225,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Execute Program"
 #~ msgstr "�รีย���ร��รม�ำ�า�"
 
-#~ msgid "Run in Terminal"
-#~ msgstr "�รีย�����อร�มิ�ัล"
-
 #~ msgid "_Pass:"
 #~ msgstr "_��า�:"
 
@@ -9825,9 +10243,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "<b>Branch:</b>"
 #~ msgstr "<b>����:</b>"
 
-#~ msgid "<b>Filters</b>"
-#~ msgstr "<b>�ัว�รอ�</b>"
-
 #~ msgid "<b>Log Message:</b>"
 #~ msgstr "<b>��อ�วาม�ูม:</b>"
 
@@ -10157,9 +10572,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "<b>Enter the base path of your project:</b>"
 #~ msgstr "<b>��อ��า��ริ�ม����อ���ร��าร�อ��ุ�:</b>"
 
-#~ msgid "Confirmation"
-#~ msgstr "�ารยื�ยั�"
-
 #~ msgid "_Sample action"
 #~ msgstr "�าร�ระ�ำ�ัว_อย�า�"
 
@@ -10327,9 +10739,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Pressing tab inserts indentation"
 #~ msgstr "�าร��������ร��ารร��ย�อห��า"
 
-#~ msgid "Select highlight style to edit:"
-#~ msgstr "�ลือ�รู�����าร�����ี��ะ�����:"
-
 #~ msgid "Selection background:"
 #~ msgstr "สี�ื��หลั��าร�ลือ�:"
 
@@ -10569,9 +10978,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Cachegrind"
 #~ msgstr "Cachegrind"
 
-#~ msgid "Error contains"
-#~ msgstr "��อ�ิ��ลา�มี�ำว�า"
-
 #~ msgid "Function contains"
 #~ msgstr "�ั����ั�มี�ำว�า"
 
@@ -10928,9 +11334,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Close"
 #~ msgstr "�ิ�"
 
-#~ msgid "No properties available for this group"
-#~ msgstr "�ม�มี�ุ�สม�ั�ิสำหรั��ลุ�ม�ี�"
-
 #~ msgid "Stock Encodings"
 #~ msgstr "�ลั��าร���ารหัส"
 
@@ -10952,9 +11355,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Unsaved Document %d"
 #~ msgstr "�อ�สารยั��ม��ั��ึ� %d"
 
-#~ msgid "Loading"
-#~ msgstr "�ำลั��หล�"
-
 #~ msgid "Saving..."
 #~ msgstr "�ำลั��ั��ึ�..."
 
@@ -10997,9 +11397,6 @@ msgstr "�����อ��� Autotools สำหรั���รื�
 #~ msgid "Update Global Tags"
 #~ msgstr "�รั���อมูล������ล�อล"
 
-#~ msgid "Refresh symbol browser tree"
-#~ msgstr "�รีย���อมูล�หม��อ� tree ��ราว���อร�สั�ลั�ษ��"
-
 #~ msgid "Fixed data-view"
 #~ msgstr "�าร�ส����อมูล����าย�ัว"